diff for duplicates of <20110511025207.GA4051@ericsson.com> diff --git a/a/1.txt b/N1/1.txt index 534cebe..09cfb80 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -468,7 +468,7 @@ Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> > /* If we haven't Gameport support, try to get CIR support */ > if (!test_bit(WDTS_USE_GP, &wdt_status)) { > if (!request_region(CIR_BASE, 8, WATCHDOG_NAME)) { -> - if (rc = -EIO) +> - if (rc == -EIO) > + if (gp_rreq_fail) > printk(KERN_ERR PFX > "I/O Address 0x%04x and 0x%04x" @@ -485,7 +485,7 @@ Acked-by: Guenter Roeck <guenter.roeck@ericsson.com> > superio_outb(0x00, CIR_ILS); > ciract = superio_inb(ACTREG); > superio_outb(0x01, ACTREG); -> - if (rc = -EIO) { +> - if (rc == -EIO) { > + if (gp_rreq_fail) { > superio_select(GAMEPORT); > superio_outb(gpact, ACTREG); @@ -553,7 +553,7 @@ access during the calls to register_reboot_notifier() and misc_register(). > - } 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); @@ -575,8 +575,3 @@ access during the calls to register_reboot_notifier() and misc_register(). > > 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 73d8c34..d38a708 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01304966644-19798-1-git-send-email-natg@google.com\0" "ref\01304966707-19850-1-git-send-email-natg@google.com\0" "From\0Guenter Roeck <guenter.roeck@ericsson.com>\0" - "Subject\0Re: [lm-sensors] [PATCH v10 1/2] Use \"request_muxed_region\" in it87\0" - "Date\0Wed, 11 May 2011 02:52:07 +0000\0" + "Subject\0Re: [PATCH v10 1/2] Use \"request_muxed_region\" in it87 watchdog drivers\0" + "Date\0Tue, 10 May 2011 19:52:07 -0700\0" "To\0Nat Gurumoorthy <natg@google.com>\0" "Cc\0Jean Delvare <khali@linux-fr.org>" Wim Van Sebroeck <wim@iguana.be> @@ -481,7 +481,7 @@ "> /* If we haven't Gameport support, try to get CIR support */\n" "> if (!test_bit(WDTS_USE_GP, &wdt_status)) {\n" "> if (!request_region(CIR_BASE, 8, WATCHDOG_NAME)) {\n" - "> - if (rc = -EIO)\n" + "> - if (rc == -EIO)\n" "> + if (gp_rreq_fail)\n" "> printk(KERN_ERR PFX\n" "> \"I/O Address 0x%04x and 0x%04x\"\n" @@ -498,7 +498,7 @@ "> superio_outb(0x00, CIR_ILS);\n" "> ciract = superio_inb(ACTREG);\n" "> superio_outb(0x01, ACTREG);\n" - "> - if (rc = -EIO) {\n" + "> - if (rc == -EIO) {\n" "> + if (gp_rreq_fail) {\n" "> superio_select(GAMEPORT);\n" "> superio_outb(gpact, ACTREG);\n" @@ -566,7 +566,7 @@ "> - } else {\n" "> - superio_select(CIR);\n" "> - superio_outb(ciract, ACTREG);\n" - "> + if (superio_enter() = 0) {\n" + "> + if (superio_enter() == 0) {\n" "> + superio_select(GPIO);\n" "> + superio_outb(0x00, WDTCTRL);\n" "> + superio_outb(0x00, WDTCFG);\n" @@ -587,11 +587,6 @@ "> - spin_unlock_irqrestore(&spinlock, flags);\n" "> \n" "> misc_deregister(&wdt_miscdev);\n" - "> unregister_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 + > unregister_reboot_notifier(&wdt_notifier); -bb65ad296b2618b4b07d42c9a18a94cf1aa0b3c57a4d4a8f2ea6e99bbd989f46 +8a026ca6bb116fd71511c20f0d22ca90628d47c061999e6e12010c28d5c8d768
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.