Merge tag 'dmaengine-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw...

[firefly-linux-kernel-4.4.55.git] / drivers / rtc / rtc-isl12022.c

diff --git a/drivers/rtc/rtc-isl12022.c b/drivers/rtc/rtc-isl12022.c
index 5dbdc4405718f55705151b7f62ad8d76db154341..03b8911294288afb2ba29bd86811fd8723da0658 100644 (file)
--- a/drivers/rtc/rtc-isl12022.c
+++ b/drivers/rtc/rtc-isl12022.c
@@ -268,7 +268,7 @@ static int isl12022_probe(struct i2c_client *client,
        isl12022->rtc = devm_rtc_device_register(&client->dev,
                                        isl12022_driver.driver.name,
                                        &isl12022_rtc_ops, THIS_MODULE);
-       return PTR_RET(isl12022->rtc);
+       return PTR_ERR_OR_ZERO(isl12022->rtc);
 }
 
 static const struct i2c_device_id isl12022_id[] = {