summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndrej Zary <linux@rainbow-software.org>2010-08-10 18:01:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-11 08:59:00 -0700
commitc94babbaf85c3162bd53a722ceeea32a0982d436 (patch)
treea13b78da83b131607c8e84920a4501dd50ecaff4
parenteb6edad3ec23265e6bf48035531a035e7eeba5f5 (diff)
downloadlinux-stable-c94babbaf85c3162bd53a722ceeea32a0982d436.tar.gz
linux-stable-c94babbaf85c3162bd53a722ceeea32a0982d436.tar.bz2
linux-stable-c94babbaf85c3162bd53a722ceeea32a0982d436.zip
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>
-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)
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);