zram: fix race between backing_dev_show and backing_dev_store

[linux.git] / drivers / mfd / 88pm860x-core.c

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 9e0bd135730ff15152c51915cfca1bef5e3b7d61..c9bae71f643aefaa28adcdd3dee77ffd16931626 100644 (file)
--- a/drivers/mfd/88pm860x-core.c
+++ b/drivers/mfd/88pm860x-core.c
@@ -1178,12 +1178,12 @@ static int pm860x_probe(struct i2c_client *client)
         */
        if (pdata->companion_addr && (pdata->companion_addr != client->addr)) {
                chip->companion_addr = pdata->companion_addr;
-               chip->companion = i2c_new_dummy(chip->client->adapter,
+               chip->companion = i2c_new_dummy_device(chip->client->adapter,
                                                chip->companion_addr);
-               if (!chip->companion) {
+               if (IS_ERR(chip->companion)) {
                        dev_err(&client->dev,
                                "Failed to allocate I2C companion device\n");
-                       return -ENODEV;
+                       return PTR_ERR(chip->companion);
                }
                chip->regmap_companion = regmap_init_i2c(chip->companion,
                                                        &pm860x_regmap_config);