From: Tejun Heo <htejun@gmail.com>
Date: Fri, 24 Mar 2006 06:25:31 +0000 (+0900)
Subject: [PATCH] libata: use ata_dev_disable() in ata_bus_probe()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fcef978f9d4bd6ec43f89031442ee205987a912a;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[PATCH] libata: use ata_dev_disable() in ata_bus_probe()

We may or may not disable a device after ata_dev_configure() fails.
Kill 'not supported, ignoring' message in ata_dev_configure() and use
ata_dev_disable() in ata_bus_probe().

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index d1530b9fd8e7..b08e79ffd769 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1363,8 +1363,6 @@ static int ata_dev_configure(struct ata_port *ap, struct ata_device *dev,
 	return 0;
 
 err_out_nosup:
-	printk(KERN_WARNING "ata%u: dev %u not supported, ignoring\n",
-	       ap->id, dev->devno);
 	DPRINTK("EXIT, err\n");
 	return rc;
 }
@@ -1431,7 +1429,7 @@ static int ata_bus_probe(struct ata_port *ap)
 		}
 
 		if (ata_dev_configure(ap, dev, 1)) {
-			dev->class++;	/* disable device */
+			ata_dev_disable(ap, dev);
 			continue;
 		}