g_NCR5380: remove misleading pnp error message

PATCH New [email protected] 1 participant 1 message Apr 27, 2010

Subsystems (2)

SCSI Ncr 5380 SCSI drivers

lore

Share & tools

lore

[email protected]

author

2010-04-27 21:27 UTC #0 lore raw

PATCH 11/28 g_NCR5380: remove misleading pnp error message

From: Ondrej Zary <[email protected]>

Remove misleading error message that appears after pnp card has been detected correctly.

Signed-off-by Ondrej Zary <[email protected]>

Cc James Bottomley <[email protected]>

Signed-off-by Andrew Morton <[email protected]>

---

 drivers/scsi/g_NCR5380.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

drivers/scsi/g_NCR5380.c renamed from drivers/scsi/g_NCR5380.c~g_ncr5380-remove-misleading-pnp-error-message +1 -3

diff -puN drivers/scsi/g_NCR5380.c~g_ncr5380-remove-misleading-pnp-error-message 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);