Commit 36f21f1c authored Jan 12, 2012 by Julia Lawall Committed by John Stultz Jan 26, 2012

clocksource: cyclone: Add missing iounmap

Add missing iounmap in error handling code, in a case where the function
already preforms iounmap on some other execution path.

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

)

// <smpl>
@@
expression e;
statement S,S1;
int ret;
@@
e = \(ioremap\|ioremap_nocache\)(...)
... when != iounmap(e)
if (<+...e...+>) S
... when any
    when != iounmap(e)
*if (...)
   { ... when != iounmap(e)
     return ...; }
... when any
iounmap(e);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
[fixed up subject -jstultz]
Signed-off-by: John Stultz <john.stultz@linaro.org>

parent a99cbf6b

drivers/clocksource/cyclone.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -55,11 +55,11 @@ static int __init init_cyclone_clocksource(void)
	}		}
	/* even on 64bit systems, this is only 32bits: */		/* even on 64bit systems, this is only 32bits: */
	base = readl(reg);		base = readl(reg);
			iounmap(reg);
	if (!base) {		if (!base) {
	printk(KERN_ERR "Summit chipset: Could not find valid CBAR value.\n");		printk(KERN_ERR "Summit chipset: Could not find valid CBAR value.\n");
	return -ENODEV;		return -ENODEV;
	}		}
	iounmap(reg);

	/* setup PMCC: */		/* setup PMCC: */
	offset = base + CYCLONE_PMCC_OFFSET;		offset = base + CYCLONE_PMCC_OFFSET;