X-Git-Url: http://git.samba.org/samba.git/?a=blobdiff_plain;f=drivers%2Fclocksource%2Ftimer-of.c;h=4d7aef9d9c15422df0e9973e72379b2e21256f47;hb=f13db334bf7b68b0086d04ab6a51517ba41123b4;hp=d509b500a7b5f8565514352a0313cb4704976042;hpb=216e4a1def29a0d04182875034efb764eb37b8ff;p=sfrench%2Fcifs-2.6.git

diff --git a/drivers/clocksource/timer-of.c b/drivers/clocksource/timer-of.c
index d509b500a7b5..4d7aef9d9c15 100644
--- a/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@ -128,9 +128,9 @@ static __init int timer_base_init(struct device_node *np,
 	const char *name = of_base->name ? of_base->name : np->full_name;
 
 	of_base->base = of_io_request_and_map(np, of_base->index, name);
-	if (!of_base->base) {
+	if (IS_ERR(of_base->base)) {
 		pr_err("Failed to iomap (%s)\n", name);
-		return -ENXIO;
+		return PTR_ERR(of_base->base);
 	}
 
 	return 0;