Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

watchdog: ep93xx_wdt.c: fix platform probe

Browse source 
Fix the device/driver init so that the misc_register
happens as last (since this opens userspace access to
the device).

Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
This commit is contained in:
Wim Van Sebroeck 2012-03-13 09:06:12 +01:00
parent 3e0113a896
commit 697b41e4d4
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/watchdog/ep93xx_wdt.c
View file

@ -224,21 +224,21 @@ static int __devinit ep93xx_wdt_probe(struct platform_device *pdev)
if (!mmio_base) if (!mmio_base)
return -ENXIO; return -ENXIO;
err = misc_register(&ep93xx_wdt_miscdev);
val = readl(mmio_base + EP93XX_WATCHDOG);
boot_status = val & 0x01 ? 1 : 0;
pr_info("EP93XX watchdog, driver version " WDT_VERSION "%s\n",
(val & 0x08) ? " (nCS1 disable detected)" : "");
if (timeout < 1 || timeout > 3600) { if (timeout < 1 || timeout > 3600) {
timeout = WDT_TIMEOUT; timeout = WDT_TIMEOUT;
pr_info("timeout value must be 1<=x<=3600, using %d\n", pr_info("timeout value must be 1<=x<=3600, using %d\n",
timeout); timeout);
} }
val = readl(mmio_base + EP93XX_WATCHDOG);
boot_status = val & 0x01 ? 1 : 0;
setup_timer(&timer, ep93xx_timer_ping, 1); setup_timer(&timer, ep93xx_timer_ping, 1);
err = misc_register(&ep93xx_wdt_miscdev);
pr_info("EP93XX watchdog, driver version " WDT_VERSION "%s\n",
(val & 0x08) ? " (nCS1 disable detected)" : "");
return err; return err;
} }