Commit 78595575 authored by Alan Cox's avatar Alan Cox Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: Fix a theoretical Ooops case

Found by a static analyser. It is in theory possible we dereference
dev->id when it has become invalid. Re-order to avoid this.

Not needed for new-ide as we no longer support the crazy exabyte nest stuff
Signed-off-by: default avatarAlan Cox <>
Cc: Andrew Morton <>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <>
parent b42fa133
......@@ -574,11 +574,11 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
/* look for ATAPI device */
(void) do_probe(drive, WIN_PIDENTIFY);
if (strstr(drive->id->model, "E X A B Y T E N E S T"))
if (!drive->present)
/* drive not found */
return 0;
if (strstr(drive->id->model, "E X A B Y T E N E S T"))
/* identification failed? */
if (!drive->id_read) {
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