Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 697b41e4 authored by Wim Van Sebroeck's avatar Wim Van Sebroeck
Browse files

watchdog: ep93xx_wdt.c: fix platform probe 



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

Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
parent 3e0113a8

drivers/watchdog/ep93xx_wdt.c

+8 −8
Original line number Original line Diff line number Diff line
@@ -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;

}

}