diff options
| author | Alan Cox <alan@redhat.com> | 2007-07-03 22:28:35 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-03 22:28:35 +0200 |
| commit | 785955752fde4c555a1d9f74ddfe1f7aca3e0c7f (patch) | |
| tree | 0019a73818f02602467ba3e87d30109128a57f78 /drivers/ide | |
| parent | b42fa133110fa952299fa76cbe91226c14838261 (diff) | |
| download | linux-785955752fde4c555a1d9f74ddfe1f7aca3e0c7f.tar.gz linux-785955752fde4c555a1d9f74ddfe1f7aca3e0c7f.tar.bz2 linux-785955752fde4c555a1d9f74ddfe1f7aca3e0c7f.zip | |
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>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/ide-probe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 41bfa4d21ab6..f5ce22c38f82 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -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) { |