diff options
| author | Richard Fitzgerald <rf@opensource.wolfsonmicro.com> | 2015-10-02 14:29:15 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2015-10-30 18:20:30 +0100 |
| commit | 2e44e28ad2628cd29a4829ffab06fe7e3b79469c (patch) | |
| tree | 9735e103f5685ec5c0787d7377b1caaacc6002da /drivers/mfd/arizona-i2c.c | |
| parent | mfd: arizona: Remove use of codec build config #ifdefs (diff) | |
| download | linux-2e44e28ad2628cd29a4829ffab06fe7e3b79469c.tar.xz linux-2e44e28ad2628cd29a4829ffab06fe7e3b79469c.zip | |
mfd: arizona: Use correct type ID for device tree config
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 <rf@opensource.wolfsonmicro.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd/arizona-i2c.c')
| -rw-r--r-- | drivers/mfd/arizona-i2c.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mfd/arizona-i2c.c b/drivers/mfd/arizona-i2c.c index 914bdce58bdf..4e3afd1861fc 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; |