From 76816b532a5ffad814de39a888dc869ab4a0b1b7 Mon Sep 17 00:00:00 2001 From: Peter Teoh Date: Fri, 7 Mar 2008 21:53:49 +0100 Subject: [PATCH] --- yaml --- r: 87045 b: refs/heads/master c: 0c6025d44448bd688dfd351a09bc620aafa4d1ff h: refs/heads/master i: 87043: 6119acc14f0db4d3564dbe0510e3c89eadac451e v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 859e92a33377..05138ea7f3dc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef4298d0f06c788d204caa9e395de6e9e2fd9fc9 +refs/heads/master: 0c6025d44448bd688dfd351a09bc620aafa4d1ff diff --git a/trunk/drivers/ide/ide.c b/trunk/drivers/ide/ide.c index fa16bc30bbc9..c2b791224097 100644 --- a/trunk/drivers/ide/ide.c +++ b/trunk/drivers/ide/ide.c @@ -667,7 +667,6 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *), do { hwif = ide_deprecated_find_port(hw->io_ports[IDE_DATA_OFFSET]); - index = hwif->index; if (hwif) goto found; for (index = 0; index < MAX_HWIFS; index++) @@ -675,6 +674,7 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *), } while (retry--); return -1; found: + index = hwif->index; if (hwif->present) ide_unregister(index, 0, 1); else if (!hwif->hold)