Commit 0c6025d4 authored by Peter Teoh's avatar Peter Teoh Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: fix buggy code in ide_register_hw() 



Relocating the index to come after finding the hwif pointer.

Signed-off-by: default avatarPeter Teoh <htmldeveloper@gmail.com>
Reported-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent ef4298d0

drivers/ide/ide.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)