]> git.karo-electronics.de Git - linux-beck.git/commitdiff
rtc: m41t80: use devm_add_action_or_reset()
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Sun, 3 Jul 2016 20:18:58 +0000 (21:18 +0100)
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>
Tue, 19 Jul 2016 15:27:40 +0000 (17:27 +0200)
If devm_add_action() fails we are explicitly calling the cleanup to free
the resources allocated.  Lets use the helper devm_add_action_or_reset()
and return directly in case of error, as we know that the cleanup function
has been already called by the helper if there was any error.

Signed-off-by: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
drivers/rtc/rtc-m41t80.c

index c829bc45a3714855811361663254582e4b7f8192..61b911c1b596e9c55b11d542134fd1052eb2dde8 100644 (file)
@@ -829,10 +829,9 @@ static int m41t80_probe(struct i2c_client *client,
                return rc;
        }
 
-       rc = devm_add_action(&client->dev, m41t80_remove_sysfs_group,
-                            &client->dev);
+       rc = devm_add_action_or_reset(&client->dev, m41t80_remove_sysfs_group,
+                                     &client->dev);
        if (rc) {
-               m41t80_remove_sysfs_group(&client->dev);
                dev_err(&client->dev,
                        "Failed to add sysfs cleanup action: %d\n", rc);
                return rc;