On Fri, 02 Oct 2015, Charles Keepax wrote: > From: Richard Fitzgerald <[email protected]> > > In the case of a device tree config the code uses the device ID > from the DT entry to check which codec is required but when storing > the ID into struct arizona it was always using the non-DT SPI device > table to get an ID. > > This patch changes the code to store the correct ID into struct arizona. > > Signed-off-by: Richard Fitzgerald <[email protected]> > Acked-by: Lee Jones <[email protected]> > Signed-off-by: Charles Keepax <[email protected]> > --- > drivers/mfd/arizona-i2c.c | 5 ++--- > drivers/mfd/arizona-spi.c | 5 ++--- > 2 files changed, 4 insertions(+), 6 deletions(-)
Applied, thanks. > diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c > index 914bdce..4e3afd1 100644 > --- a/drivers/mfd/arizona-i2c.c > +++ b/drivers/mfd/arizona-i2c.c > @@ -56,8 +56,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c, > regmap_config = &wm8998_i2c_regmap; > break; > default: > - dev_err(&i2c->dev, "Unknown device type %ld\n", > - id->driver_data); > + dev_err(&i2c->dev, "Unknown device type %ld\n", type); > return -EINVAL; > } > > @@ -79,7 +78,7 @@ static int arizona_i2c_probe(struct i2c_client *i2c, > return ret; > } > > - arizona->type = id->driver_data; > + arizona->type = type; > arizona->dev = &i2c->dev; > arizona->irq = i2c->irq; > > diff --git a/drivers/mfd/arizona-spi.c b/drivers/mfd/arizona-spi.c > index 850a63a..8cffb1c 100644 > --- a/drivers/mfd/arizona-spi.c > +++ b/drivers/mfd/arizona-spi.c > @@ -47,8 +47,7 @@ static int arizona_spi_probe(struct spi_device *spi) > regmap_config = &wm5110_spi_regmap; > break; > default: > - dev_err(&spi->dev, "Unknown device type %ld\n", > - id->driver_data); > + dev_err(&spi->dev, "Unknown device type %ld\n", type); > return -EINVAL; > } > > @@ -70,7 +69,7 @@ static int arizona_spi_probe(struct spi_device *spi) > return ret; > } > > - arizona->type = id->driver_data; > + arizona->type = type; > arizona->dev = &spi->dev; > arizona->irq = spi->irq; > -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
