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

Commit bb5dc366 authored by Jiri Slaby's avatar Jiri Slaby Committed by Wim Van Sebroeck
Browse files

[WATCHDOG] i6300esb.c-2-bugs-little-cleanup.patch 



In i6300esb.c watchdog card driver were 2 bugs (misused pc_match_device and
pci_dev_put wasn't called in one error case) and one little cleanup was
done (long line was converted to a shorter one with using built-in macro).

Signed-off-by: default avatarJiri Slaby <xslaby@fi.muni.cz>
Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 811f9991

drivers/char/watchdog/i6300esb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -345,7 +345,7 @@ static struct notifier_block esb_notifier = { 
 * want to register another driver on the same PCI id.

 * want to register another driver on the same PCI id.

 */

 */

static struct pci_device_id esb_pci_tbl[] = {

static struct pci_device_id esb_pci_tbl[] = {

        { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9, PCI_ANY_ID, PCI_ANY_ID, },

        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB_9), },

        { 0, },                 /* End of list */

        { 0, },                 /* End of list */

};

};

MODULE_DEVICE_TABLE (pci, esb_pci_tbl);

MODULE_DEVICE_TABLE (pci, esb_pci_tbl);
@@ -365,7 +365,7 @@ static unsigned char __init esb_getdevice (void) 
         */

         */





        for_each_pci_dev(dev) {

        for_each_pci_dev(dev) {

                if (pci_match_device(esb_pci_tbl, dev)) {

                if (pci_match_id(esb_pci_tbl, dev)) {

                        esb_pci = dev;

                        esb_pci = dev;

                        break;

                        break;

                }

                }