[PATCH] libata: allow ->probe_reset to return ATA_DEV_UNKNOWN

This patch makes ata_bus_probe() normalize classes[] returned by
->probe_reset such that ->probe_reset can return ATA_DEV_UNKNOWN.
This eases implementation of ->probe_reset's which don't directly use
ata_drive_probe_reset().

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index cef85e515c4c4290d94d6148a2b152441d11464e..9ddb568267e11d8041ea9f2b1570334dbf637ef4 100644 (file)
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1142,8 +1142,11 @@ static int ata_bus_probe(struct ata_port *ap)
 
                rc = ap->ops->probe_reset(ap, classes);
                if (rc == 0) {
-                       for (i = 0; i < ATA_MAX_DEVICES; i++)
+                       for (i = 0; i < ATA_MAX_DEVICES; i++) {
+                               if (classes[i] == ATA_DEV_UNKNOWN)
+                                       classes[i] = ATA_DEV_NONE;
                                ap->device[i].class = classes[i];
+                       }
                } else {
                        printk(KERN_ERR "ata%u: probe reset failed, "
                               "disabling port\n", ap->id);