diff for duplicates of <1304708058-10372-1-git-send-email-natg@google.com> diff --git a/a/1.txt b/N1/1.txt index b2b224e..352fe1a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -458,7 +458,7 @@ index b1bc72f..4def56d 100644 if (!test_bit(WDTS_USE_GP, &wdt_status)) { + int ret; if (!request_region(CIR_BASE, 8, WATCHDOG_NAME)) { - if (rc = -EIO) + if (rc == -EIO) printk(KERN_ERR PFX @@ -646,8 +678,9 @@ static int __init it87_wdt_init(void) goto err_out; @@ -531,7 +531,7 @@ index b1bc72f..4def56d 100644 - } else { - superio_select(CIR); - superio_outb(ciract, ACTREG); -+ if (superio_enter() = 0) { ++ if (superio_enter() == 0) { + superio_select(GPIO); + superio_outb(0x00, WDTCTRL); + superio_outb(0x00, WDTCFG); @@ -553,8 +553,3 @@ index b1bc72f..4def56d 100644 misc_deregister(&wdt_miscdev); unregister_reboot_notifier(&wdt_notifier); - -_______________________________________________ -lm-sensors mailing list -lm-sensors@lm-sensors.org -http://lists.lm-sensors.org/mailman/listinfo/lm-sensors diff --git a/a/content_digest b/N1/content_digest index e0f81c6..b0bf21b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01304707960-10178-1-git-send-email-natg@google.com\0" "From\0Nat Gurumoorthy <natg@google.com>\0" - "Subject\0[lm-sensors] [PATCH v8 1/2] Use \"request_muxed_region\" in it87\0" - "Date\0Fri, 06 May 2011 18:54:18 +0000\0" + "Subject\0[PATCH v8 1/2] Use \"request_muxed_region\" in it87 watchdog drivers\0" + "Date\0Fri, 6 May 2011 11:54:18 -0700\0" "To\0Jean Delvare <khali@linux-fr.org>" Guenter Roeck <guenter.roeck@ericsson.com> Wim Van Sebroeck <wim@iguana.be> @@ -471,7 +471,7 @@ " \tif (!test_bit(WDTS_USE_GP, &wdt_status)) {\n" "+\t\tint ret;\n" " \t\tif (!request_region(CIR_BASE, 8, WATCHDOG_NAME)) {\n" - " \t\t\tif (rc = -EIO)\n" + " \t\t\tif (rc == -EIO)\n" " \t\t\t\tprintk(KERN_ERR PFX\n" "@@ -646,8 +678,9 @@ static int __init it87_wdt_init(void)\n" " \t\t\tgoto err_out;\n" @@ -544,7 +544,7 @@ "-\t} else {\n" "-\t\tsuperio_select(CIR);\n" "-\t\tsuperio_outb(ciract, ACTREG);\n" - "+\tif (superio_enter() = 0) {\n" + "+\tif (superio_enter() == 0) {\n" "+\t\tsuperio_select(GPIO);\n" "+\t\tsuperio_outb(0x00, WDTCTRL);\n" "+\t\tsuperio_outb(0x00, WDTCFG);\n" @@ -565,11 +565,6 @@ "-\t\tspin_unlock_irqrestore(&spinlock, flags);\n" " \n" " \tmisc_deregister(&wdt_miscdev);\n" - " \tunregister_reboot_notifier(&wdt_notifier);\n" - "\n" - "_______________________________________________\n" - "lm-sensors mailing list\n" - "lm-sensors@lm-sensors.org\n" - http://lists.lm-sensors.org/mailman/listinfo/lm-sensors + " \tunregister_reboot_notifier(&wdt_notifier);" -e6ea394d6c5162b8f53d8213c39cf28b595fa2690f08777b03e6a74c6f9c9683 +f01fa8b6eaf538a84ad75a3afaf49e36eee616370e53efacdb9c0effc8354e3f
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.