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: Alan Cox <alan@redhat.com> Cc: Andrew Morton <akpm@osdl.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
b42fa13311
commit
785955752f
@ -574,11 +574,11 @@ static inline u8 probe_for_drive (ide_drive_t *drive)
|
|||||||
/* look for ATAPI device */
|
/* look for ATAPI device */
|
||||||
(void) do_probe(drive, WIN_PIDENTIFY);
|
(void) do_probe(drive, WIN_PIDENTIFY);
|
||||||
}
|
}
|
||||||
if (strstr(drive->id->model, "E X A B Y T E N E S T"))
|
|
||||||
enable_nest(drive);
|
|
||||||
if (!drive->present)
|
if (!drive->present)
|
||||||
/* drive not found */
|
/* drive not found */
|
||||||
return 0;
|
return 0;
|
||||||
|
if (strstr(drive->id->model, "E X A B Y T E N E S T"))
|
||||||
|
enable_nest(drive);
|
||||||
|
|
||||||
/* identification failed? */
|
/* identification failed? */
|
||||||
if (!drive->id_read) {
|
if (!drive->id_read) {
|
||||||
|
Loading…
Reference in New Issue
Block a user