UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ide: fix buggy code in ide_register_hw() 

Relocating the index to come after finding the hwif pointer.

Signed-off-by: Peter Teoh <htmldeveloper@gmail.com>
Reported-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Peter Teoh 2008-03-07 21:53:49 +01:00 committed by Bartlomiej Zolnierkiewicz
parent ef4298d0f0
commit 0c6025d444
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/ide.c
View File

@ -667,7 +667,6 @@ int ide_register_hw(hw_regs_t *hw, void (*quirkproc)(ide_drive_t *),
do { do {
hwif = ide_deprecated_find_port(hw->io_ports[IDE_DATA_OFFSET]); hwif = ide_deprecated_find_port(hw->io_ports[IDE_DATA_OFFSET]);
index = hwif->index;
if (hwif) if (hwif)
goto found; goto found;
for (index = 0; index < MAX_HWIFS; index++) 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--); } while (retry--);
return -1; return -1;
found: found:
index = hwif->index;
if (hwif->present) if (hwif->present)
ide_unregister(index, 0, 1); ide_unregister(index, 0, 1);
else if (!hwif->hold) else if (!hwif->hold)