diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:31:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-14 15:31:48 -0700 |
| commit | 655bdb0e07384d04d1ecfd709c7aee6cc8bd8793 (patch) | |
| tree | 069dc6332c2987dd7a357c069b6316404147d01e /drivers | |
| parent | e7d688ec86c9c6aa94b58eeb266f833a76407018 (diff) | |
| parent | 03717e3d12b625268848414e39beda25e4515692 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
watchdog: Fix rio watchdog probe function
sparc64: Set IRQF_DISABLED on LDC channel IRQs.
sparc64: Fix D-cache flushing on swapin from SW devices.
sparc64: Fix niagara2 perf IRQ bits.
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 1e8f02f440e..d3c824dc235 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); |