diff options
| author | Sudip Mukherjee <sudipm.mukherjee@gmail.com> | 2016-07-03 21:32:22 +0100 |
|---|---|---|
| committer | Alexandre Belloni <alexandre.belloni@free-electrons.com> | 2016-07-19 17:27:42 +0200 |
| commit | d8cac8d93e17d7531d154d94ca9f9e597fe58cad (patch) | |
| tree | dff9defc1ad47cfac170a7d66a6f7a41a368dee4 /drivers/rtc | |
| parent | 104b2d8776a42e2b8f9d349adfd71af0794e2a8a (diff) | |
| download | linux-stable-d8cac8d93e17d7531d154d94ca9f9e597fe58cad.tar.gz linux-stable-d8cac8d93e17d7531d154d94ca9f9e597fe58cad.tar.bz2 linux-stable-d8cac8d93e17d7531d154d94ca9f9e597fe58cad.zip | |
rtc: abx80x: use devm_add_action_or_reset()
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>
Diffstat (limited to 'drivers/rtc')
| -rw-r--r-- | drivers/rtc/rtc-abx80x.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c index ba0d61934d35..fea9a60b06cf 100644 --- a/drivers/rtc/rtc-abx80x.c +++ b/drivers/rtc/rtc-abx80x.c @@ -643,17 +643,15 @@ static int abx80x_probe(struct i2c_client *client, return err; } - err = devm_add_action(&client->dev, rtc_calib_remove_sysfs_group, - &client->dev); - if (err) { - rtc_calib_remove_sysfs_group(&client->dev); + err = devm_add_action_or_reset(&client->dev, + rtc_calib_remove_sysfs_group, + &client->dev); + if (err) dev_err(&client->dev, "Failed to add sysfs cleanup action: %d\n", err); - return err; - } - return 0; + return err; } static int abx80x_remove(struct i2c_client *client) |