Merge branch 'stable/for-jens-3.13-take-two' of git://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / rtc / rtc-max6900.c

diff --git a/drivers/rtc/rtc-max6900.c b/drivers/rtc/rtc-max6900.c
index 55969b1b771a344a69125e2d517f8a6cdfc8f335..4804985b876e850572d07c928e9913d8bd31175b 100644 (file)
--- a/drivers/rtc/rtc-max6900.c
+++ b/drivers/rtc/rtc-max6900.c
@@ -164,14 +164,7 @@ static int max6900_i2c_read_time(struct i2c_client *client, struct rtc_time *tm)
 
 static int max6900_i2c_clear_write_protect(struct i2c_client *client)
 {
-       int rc;
-       rc = i2c_smbus_write_byte_data(client, MAX6900_REG_CONTROL_WRITE, 0);
-       if (rc < 0) {
-               dev_err(&client->dev, "%s: control register write failed\n",
-                       __func__);
-               return -EIO;
-       }
-       return 0;
+       return i2c_smbus_write_byte_data(client, MAX6900_REG_CONTROL_WRITE, 0);
 }
 
 static int