The patch titled acpiphp: fix missing acpiphp_glue_exit() has been added to the -mm tree. Its filename is acpiphp-fix-missing-acpiphp_glue_exit.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: acpiphp: fix missing acpiphp_glue_exit() From: Akinobu Mita <akinobu.mita@xxxxxxxxx> acpiphp_glue_exit() needs to be called to unwind when no slots found. (It fixes data corruption when reloading acpiphp driver with no such devices) Cc: Greg Kroah-Hartman <gregkh@xxxxxxx> Cc: Kristen Carlson Accardi <kristen.c.accardi@xxxxxxxxx> Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/pci/hotplug/acpiphp_core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN drivers/pci/hotplug/acpiphp_core.c~acpiphp-fix-missing-acpiphp_glue_exit drivers/pci/hotplug/acpiphp_core.c --- a/drivers/pci/hotplug/acpiphp_core.c~acpiphp-fix-missing-acpiphp_glue_exit +++ a/drivers/pci/hotplug/acpiphp_core.c @@ -303,8 +303,10 @@ static int __init init_acpi(void) /* read initial number of slots */ if (!retval) { num_slots = acpiphp_get_num_slots(); - if (num_slots == 0) + if (num_slots == 0) { + acpiphp_glue_exit(); retval = -ENODEV; + } } return retval; _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are sc1200wdt-fix-missing-pnp_unregister_driver.patch isdn-gigaset-avoid-cs-dev-null-pointer-dereference.patch debugfs-check-return-value-correctly.patch lightning-return-proper-return-code.patch git-mtd.patch n2-fix-confusing-error-code.patch git-pcmcia.patch pci-fix-__pci_register_driver-error-handling.patch acpiphp-fix-missing-acpiphp_glue_exit.patch edac_mc-fix-error-handling.patch paride-return-proper-error-code.patch bit-revese-library.patch crc32-replace-bitreverse-by-bitrev32.patch video-use-bitrev8.patch net-use-bitrev8.patch isdn-hisax-use-bitrev8.patch atm-ambassador-use-bitrev8.patch isdn-gigaset-use-bitrev8.patch isdn-fix-missing-unregister_capi_driver.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