From 72ec1570054492ba25347e8d6b84a7b2956aec59 Mon Sep 17 00:00:00 2001 From: Wim Van Sebroeck Date: Thu, 10 Jun 2010 06:46:56 +0000 Subject: [PATCH] --- yaml --- r: 208107 b: refs/heads/master c: 4c4b638e3718344e4caeb157cfbfde1b6a7b1562 h: refs/heads/master i: 208105: b759f586ebd18cf6e408b6c63b6d4bb71541b3bc 208103: b8f26c370657f0d774769fefd5fc46fa3746f859 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/sch311x_wdt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5ac0903f8dbd..364f107b2d50 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9f2cc6f759ca0b072107c171a3b5cd79c7ea5de3 +refs/heads/master: 4c4b638e3718344e4caeb157cfbfde1b6a7b1562 diff --git a/trunk/drivers/watchdog/sch311x_wdt.c b/trunk/drivers/watchdog/sch311x_wdt.c index 9c40f48804f5..0461858e07d0 100644 --- a/trunk/drivers/watchdog/sch311x_wdt.c +++ b/trunk/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);