diff options
| author | Wolfram Sang <wsa+renesas@sang-engineering.com> | 2019-07-22 19:26:20 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2019-08-12 09:54:16 +0200 |
| commit | ad9fc1f4229ed390590c3ea5be23addf84d54672 (patch) | |
| tree | 9183cbe0565062a0b2b63c9cf69b21f678014872 /drivers/mfd | |
| parent | mfd: max8998: Convert to i2c_new_dummy_device (diff) | |
| download | linux-ad9fc1f4229ed390590c3ea5be23addf84d54672.tar.xz linux-ad9fc1f4229ed390590c3ea5be23addf84d54672.zip | |
mfd: palmas: Convert to i2c_new_dummy_device
Move from i2c_new_dummy() to i2c_new_dummy_device(), so we now get an
ERRPTR which we use in error handling.
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/palmas.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c index 6818ff34837c..f5b3fa973b13 100644 --- a/drivers/mfd/palmas.c +++ b/drivers/mfd/palmas.c @@ -549,12 +549,12 @@ static int palmas_i2c_probe(struct i2c_client *i2c, palmas->i2c_clients[i] = i2c; else { palmas->i2c_clients[i] = - i2c_new_dummy(i2c->adapter, + i2c_new_dummy_device(i2c->adapter, i2c->addr + i); - if (!palmas->i2c_clients[i]) { + if (IS_ERR(palmas->i2c_clients[i])) { dev_err(palmas->dev, "can't attach client %d\n", i); - ret = -ENOMEM; + ret = PTR_ERR(palmas->i2c_clients[i]); goto err_i2c; } palmas->i2c_clients[i]->dev.of_node = of_node_get(node); |