diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2009-10-14 01:18:26 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-11-09 16:21:59 -0800 |
commit | bfdf85fe73f1b697430bbeb763f8456e2ce52e9d (patch) | |
tree | 3b07be97c09dd1d8dad796be9f70bac6d709e3f3 /drivers | |
parent | e1f7f4182a52b850379c0d4f35a8085d9552786a (diff) |
watchdog: Fix rio watchdog probe function
[ Upstream commit 03717e3d12b625268848414e39beda25e4515692 ]
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/watchdog/riowd.c | 2 |
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); |