Messages in this thread Patch in this message | | | Subject | [PATCH] PCI: 'is_enabled' flag should be set/cleared when the device is actually enabled/disabled | Date | Wed, 4 May 2005 00:02:16 -0700 | From | Greg KH <> |
| |
[PATCH] PCI: 'is_enabled' flag should be set/cleared when the device is actually enabled/disabled
I think 'is_enabled' flag in pci_dev structure should be set/cleared when the device actually enabled/disabled. Especially about pci_enable_device(), it can be failed. By this change, we will also get the possibility of refering 'is_enabled' flag from the functions called through pci_enable_device()/pci_disable_device().
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- commit ceb43744cd48a20212e2179e0c7ff2f450a3c97e tree f9554643bc9d70fe761840a603adce393c0e9f08 parent 8800cea62025a5209d110c5fa5990429239d6eee author Kenji Kaneshige <kaneshige.kenji@soft.fujitsu.com> 1112939611 +0900 committer Greg KH <gregkh@suse.de> 1115189113 -0700
Index: drivers/pci/pci.c =================================================================== --- 2aa9e4732d7014dcda4c0e80d2e377f52e2262e9/drivers/pci/pci.c (mode:100644 sha1:bfbff83352688dc99776706033e1bb80b8282946) +++ f9554643bc9d70fe761840a603adce393c0e9f08/drivers/pci/pci.c (mode:100644 sha1:fc8cc6c53778b6336e26ef23b1ac3e78eb16c7a2) @@ -398,10 +398,10 @@ { int err; - dev->is_enabled = 1; if ((err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1))) return err; pci_fixup_device(pci_fixup_enable, dev); + dev->is_enabled = 1; return 0; } @@ -427,16 +427,15 @@ { u16 pci_command; - dev->is_enabled = 0; - dev->is_busmaster = 0; - pci_read_config_word(dev, PCI_COMMAND, &pci_command); if (pci_command & PCI_COMMAND_MASTER) { pci_command &= ~PCI_COMMAND_MASTER; pci_write_config_word(dev, PCI_COMMAND, pci_command); } + dev->is_busmaster = 0; pcibios_disable_device(dev); + dev->is_enabled = 0; } /** - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |