drm/amdgpu: hide another #warning

[linux-2.6-block.git] / drivers / mfd / palmas.c

diff --git a/drivers/mfd/palmas.c b/drivers/mfd/palmas.c
index 6818ff34837c7888c776294da10e82908999271a..f5b3fa973b132e97c5cfeb5dfa94d6d23f569f9c 100644 (file)
--- 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);