Merge tag 'mvebu-dt-fixes-non-crit-3.15' of git://git.infradead.org/linux-mvebu into...

[deliverable/linux.git] / drivers / rtc / rtc-ds1672.c

diff --git a/drivers/rtc/rtc-ds1672.c b/drivers/rtc/rtc-ds1672.c
index 18e2d847147288c6890812640376c64d87543212..a4888dbca2e11788d3ba8abfcabb904cd57185be 100644 (file)
--- a/drivers/rtc/rtc-ds1672.c
+++ b/drivers/rtc/rtc-ds1672.c
@@ -177,8 +177,9 @@ static int ds1672_probe(struct i2c_client *client,
 
        /* read control register */
        err = ds1672_get_control(client, &control);
-       if (err)
-               goto exit_devreg;
+       if (err) {
+               dev_warn(&client->dev, "Unable to read the control register\n");
+       }
 
        if (control & DS1672_REG_CONTROL_EOSC)
                dev_warn(&client->dev, "Oscillator not enabled. "
@@ -187,12 +188,10 @@ static int ds1672_probe(struct i2c_client *client,
        /* Register sysfs hooks */
        err = device_create_file(&client->dev, &dev_attr_control);
        if (err)
-               goto exit_devreg;
+               dev_err(&client->dev, "Unable to create sysfs entry: %s\n",
+                       dev_attr_control.attr.name);
 
        return 0;
-
- exit_devreg:
-       return err;
 }
 
 static struct i2c_device_id ds1672_id[] = {