Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6:
  ide: ide_scan_pcibus(): check __pci_register_driver return value
  ide: pdc202xx_new PLL input clock fix
  it821x: fix incorrect SWDMA mask
  amd74xx: resume fix
  hpt366: use correct enablebits for HPT36x
  hpt366: blacklist MAXTOR STM3320620A for UltraDMA/66
  ide: Fix a theoretical Ooops case
  ide: never called printk statement in ide-taskfile.c::wait_drive_not_busy

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) {