diff options
author | Julia Lawall <julia@diku.dk> | 2012-08-05 05:52:35 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-08-16 13:09:15 -0400 |
commit | e045907c0a08d09cbc992cd00f788ef0dd83889d (patch) | |
tree | b3bab3599f3cce36337ea240a4dc09da33640b80 /drivers/char/tlclk.c | |
parent | d2323cf77308d6aa13a3a5287310ef93c4919d1e (diff) |
drivers/char/tlclk.c: fix error return code
Convert a 0 error return code to a negative one, as returned elsewhere in the
function.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// <smpl>
@@
identifier ret;
expression e,e1,e2,e3,e4,x;
@@
(
if (\(ret != 0\|ret < 0\) || ...) { ... return ...; }
|
ret = 0
)
... when != ret = e1
*x = \(kmalloc\|kzalloc\|kcalloc\|devm_kzalloc\|ioremap\|ioremap_nocache\|devm_ioremap\|devm_ioremap_nocache\)(...);
... when != x = e2
when != ret = e3
*if (x == NULL || ...)
{
... when != ret = e4
* return ret;
}
// </smpl>
Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Mark Gross <mark.gross@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/char/tlclk.c')
-rw-r--r-- | drivers/char/tlclk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/tlclk.c b/drivers/char/tlclk.c index ce29e7cce528..e95e0ab0bd87 100644 --- a/drivers/char/tlclk.c +++ b/drivers/char/tlclk.c | |||
@@ -784,8 +784,10 @@ static int __init tlclk_init(void) | |||
784 | } | 784 | } |
785 | tlclk_major = ret; | 785 | tlclk_major = ret; |
786 | alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL); | 786 | alarm_events = kzalloc( sizeof(struct tlclk_alarms), GFP_KERNEL); |
787 | if (!alarm_events) | 787 | if (!alarm_events) { |
788 | ret = -ENOMEM; | ||
788 | goto out1; | 789 | goto out1; |
790 | } | ||
789 | 791 | ||
790 | /* Read telecom clock IRQ number (Set by BIOS) */ | 792 | /* Read telecom clock IRQ number (Set by BIOS) */ |
791 | if (!request_region(TLCLK_BASE, 8, "telco_clock")) { | 793 | if (!request_region(TLCLK_BASE, 8, "telco_clock")) { |