ide: fix EXABYTENEST handling in probe_for_drive()

Fix EXABYTENEST handling in probe_for_drive() (so drive->present
is checked for "nested" device) and cleanup enable_nest().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 7 insertions, 9 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 7578ad48080f..e78cfde5bd6d 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -542,11 +542,6 @@ static void enable_nest (ide_drive_t *drive)
                 printk(KERN_CONT "failed (status = 0x%02x)\n", stat);
         else
                 printk(KERN_CONT "success\n");
-
-        /* if !(success||timed-out) */
-        if (do_probe(drive, ATA_CMD_ID_ATA) >= 2)
-                /* look for ATAPI device */
-                (void)do_probe(drive, ATA_CMD_ID_ATAPI);
 }
 
 /**
@@ -586,19 +581,22 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
         strcpy(m, "UNKNOWN");
 
         /* skip probing? */
-        if (!drive->noprobe)
-        {
+        if (!drive->noprobe) {
+retry:
                 /* if !(success||timed-out) */
                 if (do_probe(drive, ATA_CMD_ID_ATA) >= 2)
                         /* look for ATAPI device */
                         (void)do_probe(drive, ATA_CMD_ID_ATAPI);
+
                 if (!drive->present)
                         /* drive not found */
                         return 0;
 
-                if (strstr(m, "E X A B Y T E N E S T"))
+                if (strstr(m, "E X A B Y T E N E S T")) {
                         enable_nest(drive);
-        
+                        goto retry;
+                }
+
                 /* identification failed? */
                 if (!drive->id_read) {
                         if (drive->media == ide_disk) {