summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog/riowd.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-10-14 01:18:26 -0700
committerDavid S. Miller <davem@davemloft.net>2009-10-14 01:18:26 -0700
commit03717e3d12b625268848414e39beda25e4515692 (patch)
tree8f5b80f26b8c473675aab6dcd63f5a0cfb518794 /drivers/watchdog/riowd.c
parentc58543c869606532c2382f027d6466f4672ea756 (diff)
downloadlinux-03717e3d12b625268848414e39beda25e4515692.tar.bz2
watchdog: Fix rio watchdog probe function
After sucessfully registering the misc device the driver iounmaps the hardware registers and kfree's the device data structure. Ouch ! This was introduced with commit e42311d75 (riowatchdog: Convert to pure OF driver) and went unnoticed for more than a year :) Return success instead of dropping into the error cleanup code path. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/watchdog/riowd.c')
-rw-r--r--drivers/watchdog/riowd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index 1e8f02f440e6..d3c824dc2358 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -206,7 +206,7 @@ static int __devinit riowd_probe(struct of_device *op,
dev_set_drvdata(&op->dev, p);
riowd_device = p;
- err = 0;
+ return 0;
out_iounmap:
of_iounmap(&op->resource[0], p->regs, 2);