All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent efa402d5
...@@ -542,11 +542,6 @@ static void enable_nest (ide_drive_t *drive) ...@@ -542,11 +542,6 @@ static void enable_nest (ide_drive_t *drive)
printk(KERN_CONT "failed (status = 0x%02x)\n", stat); printk(KERN_CONT "failed (status = 0x%02x)\n", stat);
else else
printk(KERN_CONT "success\n"); 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) ...@@ -586,19 +581,22 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
strcpy(m, "UNKNOWN"); strcpy(m, "UNKNOWN");
/* skip probing? */ /* skip probing? */
if (!drive->noprobe) if (!drive->noprobe) {
{ retry:
/* if !(success||timed-out) */ /* if !(success||timed-out) */
if (do_probe(drive, ATA_CMD_ID_ATA) >= 2) if (do_probe(drive, ATA_CMD_ID_ATA) >= 2)
/* look for ATAPI device */ /* look for ATAPI device */
(void)do_probe(drive, ATA_CMD_ID_ATAPI); (void)do_probe(drive, ATA_CMD_ID_ATAPI);
if (!drive->present) if (!drive->present)
/* drive not found */ /* drive not found */
return 0; 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); enable_nest(drive);
goto retry;
}
/* identification failed? */ /* identification failed? */
if (!drive->id_read) { if (!drive->id_read) {
if (drive->media == ide_disk) { if (drive->media == ide_disk) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment