The patch titled PCIE: cleanup on probe error has been added to the -mm tree. Its filename is pcie-cleanup-on-probe-error.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: PCIE: cleanup on probe error From: Randy Dunlap <rdunlap@xxxxxxxxxxxx> If pcie_portdrv_probe() fails but it had already called pci_enable_device(), then call pci_disable_device() when returning error. Is there some reason that this isn't being done? or was it just missed? Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/pci/pcie/portdrv_pci.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletion(-) diff -puN drivers/pci/pcie/portdrv_pci.c~pcie-cleanup-on-probe-error drivers/pci/pcie/portdrv_pci.c --- a/drivers/pci/pcie/portdrv_pci.c~pcie-cleanup-on-probe-error +++ a/drivers/pci/pcie/portdrv_pci.c @@ -73,8 +73,10 @@ static int __devinit pcie_portdrv_probe "%s->Dev[%04x:%04x] has invalid IRQ. Check vendor BIOS\n", __FUNCTION__, dev->device, dev->vendor); } - if (pcie_port_device_register(dev)) + if (pcie_port_device_register(dev)) { + pci_disable_device(dev); return -ENOMEM; + } return 0; } _ Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are acpi-bus-add-missing-newline.patch pcie-cleanup-on-probe-error.patch aic7-cleanup-module_parm_desc-strings.patch dc395x-fix-printk-format-warning.patch areca-raid-linux-scsi-driver.patch consistently-use-max_errno-in-__syscall_return.patch consistently-use-max_errno-in-__syscall_return-fix.patch eisa-bus-modalias-attributes-support-1.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