Commit 78595575 authored Jul 03, 2007 by Alan Cox Committed by Bartlomiej Zolnierkiewicz Jul 03, 2007

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>

parent b42fa133

drivers/ide/ide-probe.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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"))
		enable_nest(drive);
		if (!drive->present)
		/* drive not found */
		return 0;
		if (strstr(drive->id->model, "E X A B Y T E N E S T"))
		enable_nest(drive);

		/* identification failed? */
		if (!drive->id_read) {