diff options
| author | David S. Miller | 2012-02-04 22:39:32 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-02-04 22:39:32 +0100 |
| commit | dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb (patch) | |
| tree | f16ace0ae09edab16bf6d0be9e8280dfbb7100da /drivers/watchdog/nuc900_wdt.c | |
| parent | mlx4: Fix typo in cmd.c (diff) | |
| parent | netprio_cgroup: Fix obo in get_prioidx (diff) | |
| download | kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.gz kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.tar.xz kernel-qcow2-linux-dd48dc34fe7639a8b2e22d8b609672f5f81aa7cb.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/watchdog/nuc900_wdt.c')
| -rw-r--r-- | drivers/watchdog/nuc900_wdt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c index 50359bad9177..529085b8b8fb 100644 --- a/drivers/watchdog/nuc900_wdt.c +++ b/drivers/watchdog/nuc900_wdt.c @@ -72,7 +72,7 @@ struct nuc900_wdt { }; static unsigned long nuc900wdt_busy; -struct nuc900_wdt *nuc900_wdt; +static struct nuc900_wdt *nuc900_wdt; static inline void nuc900_wdt_keepalive(void) { @@ -287,7 +287,8 @@ static int __devinit nuc900wdt_probe(struct platform_device *pdev) setup_timer(&nuc900_wdt->timer, nuc900_wdt_timer_ping, 0); - if (misc_register(&nuc900wdt_miscdev)) { + ret = misc_register(&nuc900wdt_miscdev); + if (ret) { dev_err(&pdev->dev, "err register miscdev on minor=%d (%d)\n", WATCHDOG_MINOR, ret); goto err_clk; |