From 4c4b638e3718344e4caeb157cfbfde1b6a7b1562 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Thu, 10 Jun 2010 06:46:56 +0000 Subject: watchdog: sch311x_wdt.c: set parent before registeriing the misc device in probe() function Set the paranet of the misc_device before we register the misc_device. Reported-by: Akinobu Mita Signed-off-by: Wim Van sebroeck --- drivers/watchdog/sch311x_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drivers/watchdog/sch311x_wdt.c') diff --git a/drivers/watchdog/sch311x_wdt.c b/drivers/watchdog/sch311x_wdt.c index 9c40f48804f5..0461858e07d0 100644 --- a/drivers/watchdog/sch311x_wdt.c +++ b/drivers/watchdog/sch311x_wdt.c @@ -425,6 +425,8 @@ static int __devinit sch311x_wdt_probe(struct platform_device *pdev) val = therm_trip ? 0x06 : 0x04; outb(val, sch311x_wdt_data.runtime_reg + RESGEN); + sch311x_wdt_miscdev.parent = dev; + err = misc_register(&sch311x_wdt_miscdev); if (err != 0) { dev_err(dev, "cannot register miscdev on minor=%d (err=%d)\n", @@ -432,8 +434,6 @@ static int __devinit sch311x_wdt_probe(struct platform_device *pdev) goto exit_release_region3; } - sch311x_wdt_miscdev.parent = dev; - dev_info(dev, "SMSC SCH311x WDT initialized. timeout=%d sec (nowayout=%d)\n", timeout, nowayout); -- cgit v1.2.1