From c94babbaf85c3162bd53a722ceeea32a0982d436 Mon Sep 17 00:00:00 2001 From: Ondrej Zary Date: Tue, 10 Aug 2010 18:01:15 -0700 Subject: [PATCH] g_NCR5380: remove misleading pnp error message Remove misleading error message that appears after pnp card has been detected correctly. Signed-off-by: Ondrej Zary Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/scsi/g_NCR5380.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c index 75585a5..6bc0015 100644 --- a/drivers/scsi/g_NCR5380.c +++ b/drivers/scsi/g_NCR5380.c @@ -322,10 +322,8 @@ int __init generic_NCR5380_detect(struct scsi_host_template * tpnt) 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); -- 2.7.4