The patch titled drivers/rtc: correct error-handling code has been added to the -mm tree. Its filename is drivers-rtc-correct-error-handling-code.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers/rtc: correct error-handling code From: Julia Lawall <julia@xxxxxxx> 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: Julia Lawall <julia@xxxxxxx> Acked-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> Cc: David Brownell <david-b@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/rtc/rtc-ds1307.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff -puN drivers/rtc/rtc-ds1307.c~drivers-rtc-correct-error-handling-code drivers/rtc/rtc-ds1307.c --- a/drivers/rtc/rtc-ds1307.c~drivers-rtc-correct-error-handling-code +++ a/drivers/rtc/rtc-ds1307.c @@ -896,8 +896,7 @@ read_rtc: return 0; exit_irq: - if (ds1307->rtc) - rtc_device_unregister(ds1307->rtc); + rtc_device_unregister(ds1307->rtc); exit_free: kfree(ds1307); return err; _ Patches currently in -mm which might be from julia@xxxxxxx are linux-next.patch drivers-media-dvb-use-dst_type-field-instead-of-type_flags.patch drivers-ata-use-resource_size.patch drivers-rtc-correct-error-handling-code.patch drivers-video-imxfbc-fix-resource-size-off-by-1-error.patch edac-fix-resource-size-calculation.patch fs-romfs-correct-error-handling-code.patch drivers-vlynq-vlynqc-fix-resource-size-off-by-1-error.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html