zram: fix race between backing_dev_show and backing_dev_store

[linux.git] / drivers / mfd / ab3100-core.c

diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c
index 9f3dbc31d3e9fa3346ba12e999d5f6cc9a2c71fb..57723f116bb58573bd22a1949c897320cc750f58 100644 (file)
--- a/drivers/mfd/ab3100-core.c
+++ b/drivers/mfd/ab3100-core.c
@@ -865,10 +865,10 @@ static int ab3100_probe(struct i2c_client *client,
                 &ab3100->chip_name[0]);
 
        /* Attach a second dummy i2c_client to the test register address */
-       ab3100->testreg_client = i2c_new_dummy(client->adapter,
+       ab3100->testreg_client = i2c_new_dummy_device(client->adapter,
                                               client->addr + 1);
-       if (!ab3100->testreg_client) {
-               err = -ENOMEM;
+       if (IS_ERR(ab3100->testreg_client)) {
+               err = PTR_ERR(ab3100->testreg_client);
                goto exit_no_testreg_client;
        }