Commit 72445af8 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds

drivers/rtc: correct error-handling code

This code is not executed before ds1307->rtc has been successfully
initialized to the result of calling rtc_device_register.  Thus the test
that ds1307->rtc is not NULL is always true.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@match exists@
expression x, E;
statement S1, S2;
@@

x = rtc_device_register(...)
... when != x = E
(
*  if (x == NULL || ...) S1 else S2
|
*  if (x == NULL && ...) S1 else S2
)
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Acked-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d3c7a3f7
...@@ -896,8 +896,7 @@ static int __devinit ds1307_probe(struct i2c_client *client, ...@@ -896,8 +896,7 @@ static int __devinit ds1307_probe(struct i2c_client *client,
return 0; return 0;
exit_irq: exit_irq:
if (ds1307->rtc) rtc_device_unregister(ds1307->rtc);
rtc_device_unregister(ds1307->rtc);
exit_free: exit_free:
kfree(ds1307); kfree(ds1307);
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment