aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2010-08-10 21:01:15 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 11:59:00 -0400
commitc94babbaf85c3162bd53a722ceeea32a0982d436 (patch)
treea13b78da83b131607c8e84920a4501dd50ecaff4 /drivers
parenteb6edad3ec23265e6bf48035531a035e7eeba5f5 (diff)
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 <linux@rainbow-software.org> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/g_NCR5380.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/scsi/g_NCR5380.c b/drivers/scsi/g_NCR5380.c
index 75585a52c88b..6bc0015662e0 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)
322 while ((dev = pnp_find_dev(NULL, ISAPNP_VENDOR('D', 'T', 'C'), ISAPNP_FUNCTION(0x436e), dev))) { 322 while ((dev = pnp_find_dev(NULL, ISAPNP_VENDOR('D', 'T', 'C'), ISAPNP_FUNCTION(0x436e), dev))) {
323 if (count >= NO_OVERRIDES) 323 if (count >= NO_OVERRIDES)
324 break; 324 break;
325 if (pnp_device_attach(dev) < 0) { 325 if (pnp_device_attach(dev) < 0)
326 printk(KERN_ERR "dtc436e probe: attach failed\n");
327 continue; 326 continue;
328 }
329 if (pnp_activate_dev(dev) < 0) { 327 if (pnp_activate_dev(dev) < 0) {
330 printk(KERN_ERR "dtc436e probe: activate failed\n"); 328 printk(KERN_ERR "dtc436e probe: activate failed\n");
331 pnp_device_detach(dev); 329 pnp_device_detach(dev);