1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 0075fe7404d5..9194e4a6a55a 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1411,12 +1411,9 @@ static int ata_bus_probe(struct ata_port *ap)
         /* read IDENTIFY page and configure devices */
         for (i = 0; i < ATA_MAX_DEVICES; i++) {
                 dev = &ap->device[i];
-                dev->class = classes[i];
 
-                if (!tries[i]) {
-                        ata_down_xfermask_limit(ap, dev, 1);
-                        ata_dev_disable(ap, dev);
-                }
+                if (tries[i])
+                        dev->class = classes[i];
 
                 if (!ata_dev_enabled(dev))
                         continue;
@@ -1477,6 +1474,11 @@ static int ata_bus_probe(struct ata_port *ap)
                         tries[dev->devno] = 0;
         }
 
+        if (!tries[dev->devno]) {
+                ata_down_xfermask_limit(ap, dev, 1);
+                ata_dev_disable(ap, dev);
+        }
+
         goto retry;
 }