The patch titled g_NCR5380: remove misleading pnp error message has been added to the -mm tree. Its filename is g_ncr5380-remove-misleading-pnp-error-message.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: g_NCR5380: remove misleading pnp error message From: Ondrej Zary <linux@xxxxxxxxxxxxxxxxxxxx> Remove misleading error message that appears after pnp card has been detected correctly. Signed-off-by: Ondrej Zary <linux@xxxxxxxxxxxxxxxxxxxx> Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/scsi/g_NCR5380.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff -puN drivers/scsi/g_NCR5380.c~g_ncr5380-remove-misleading-pnp-error-message drivers/scsi/g_NCR5380.c --- a/drivers/scsi/g_NCR5380.c~g_ncr5380-remove-misleading-pnp-error-message +++ a/drivers/scsi/g_NCR5380.c @@ -322,10 +322,8 @@ int __init generic_NCR5380_detect(struct while ((dev = pnp_find_dev(NULL, ISAPNP_VENDOR('D', 'T', 'C'), ISAPNP_FUNCTION(0x436e), dev))) { if (count >= NO_OVERRIDES) break; - if (pnp_device_attach(dev) < 0) { - printk(KERN_ERR "dtc436e probe: attach failed\n"); + if (pnp_device_attach(dev) < 0) continue; - } if (pnp_activate_dev(dev) < 0) { printk(KERN_ERR "dtc436e probe: activate failed\n"); pnp_device_detach(dev); _ Patches currently in -mm which might be from linux@xxxxxxxxxxxxxxxxxxxx are usbtouchscreen-convert-from-usb_device-to-usb_interface.patch usbtouchscreen-find-input-endpoint-automatically.patch usbtouchscreen-add-nexio-or-inexio-support.patch usbtouchscreen-fix-nexio-ack-and-usb-disconnect.patch usbtouchscreen-dont-send-interrupt-urbs-to-bulk-endpoints.patch usbtouchscreen-fix-leaks-and-check-return-value-of-usb_submit_urb.patch g_ncr5380-remove-misleading-pnp-error-message.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