net_sched: qdisc_get_rtab() must check data[] array

[~andy/linux] / drivers / rtc / rtc-rv3029c2.c

diff --git a/drivers/rtc/rtc-rv3029c2.c b/drivers/rtc/rtc-rv3029c2.c
index f8ee8ad7825e25d0d69612d47fdaf928201f1d29..5032c24ec15938d2341927960de9e52a077b9773 100644 (file)
--- a/drivers/rtc/rtc-rv3029c2.c
+++ b/drivers/rtc/rtc-rv3029c2.c
@@ -395,9 +395,8 @@ static int rv3029c2_probe(struct i2c_client *client,
        if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_EMUL))
                return -ENODEV;
 
-       rtc = rtc_device_register(client->name,
-                               &client->dev, &rv3029c2_rtc_ops,
-                               THIS_MODULE);
+       rtc = devm_rtc_device_register(&client->dev, client->name,
+                                       &rv3029c2_rtc_ops, THIS_MODULE);
 
        if (IS_ERR(rtc))
                return PTR_ERR(rtc);
@@ -407,23 +406,14 @@ static int rv3029c2_probe(struct i2c_client *client,
        rc = rv3029c2_i2c_get_sr(client, buf);
        if (rc < 0) {
                dev_err(&client->dev, "reading status failed\n");
-               goto exit_unregister;
+               return rc;
        }
 
        return 0;
-
-exit_unregister:
-       rtc_device_unregister(rtc);
-
-       return rc;
 }
 
 static int rv3029c2_remove(struct i2c_client *client)
 {
-       struct rtc_device *rtc = i2c_get_clientdata(client);
-
-       rtc_device_unregister(rtc);
-
        return 0;
 }