The patch titled pci: initialize struct pci_dev.error_state has been added to the -mm tree. Its filename is pci-initialize-struct-pci_dev-error_state.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: pci: initialize struct pci_dev.error_state From: Linas Vepstas <linas@xxxxxxxxxxxxxx> The pci channel state is currently uninitialized, thus there are two ways of indicating that "everything's OK": 0 and 1. This is a bit of a burden. If a devce driver wants to check if the pci channel is in a working or a disconnected state, the driver writer must perform checks similar to if((pdev->error_state != 0) && (pdev->error_state != pci_channel_io_normal)) { whatever(); } which is rather akward. The first check is needed because stuct pci_dev is inited to all-zeros. The scond is needed because the error recovery will set the state to pci_channel_io_normal (which is not zero). This patch fixes this awkwardness. Signed-off-by: Linas Vepstas <linas@xxxxxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/pci/probe.c | 1 + 1 files changed, 1 insertion(+) diff -puN drivers/pci/probe.c~pci-initialize-struct-pci_dev-error_state drivers/pci/probe.c --- a/drivers/pci/probe.c~pci-initialize-struct-pci_dev-error_state +++ a/drivers/pci/probe.c @@ -815,6 +815,7 @@ pci_scan_device(struct pci_bus *bus, int dev->vendor = l & 0xffff; dev->device = (l >> 16) & 0xffff; dev->cfg_size = pci_cfg_space_size(dev); + dev->error_state = pci_channel_io_normal; /* Assume 32-bit PCI; let 64-bit PCI cards (which are far rarer) set this higher, assuming the system even supports it. */ _ Patches currently in -mm which might be from linas@xxxxxxxxxxxxxx are git-netdev-all.patch ixgb-add-pci-error-recovery-callbacks.patch e100-disable-device-on-pci-error.patch e1000-disable-device-on-pci-error.patch pci-initialize-struct-pci_dev-error_state.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html