Revert "ide: change master/slave IDENTIFY order" (f367bed0) · Commits · 戴 / test

This reverts commit . [ conflict in drivers/ide/ide-probe.c fixed manually ] It turned out that probing order change causes problems for some drives: http://bugzilla.kernel.org/show_bug.cgi?id=10239 Since root causes are still being investigated and are unlikely to be fixed before 2.6.25 lets revert this change for now. As a result cable detection becomes less reliable when compared with 2.6.24 but the affected drives are useable again. Reported-by:

Richard Genoud <richard.genoud@gmail.com> Bisected-by:

Richard Genoud <richard.genoud@gmail.com> Signed-off-by:

Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

drivers/ide/ide-iops.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -595,6 +595,7 @@ u8 eighty_ninty_three (ide_drive_t *drive)

		/*
		* FIXME:
		* - change master/slave IDENTIFY order
		* - force bit13 (80c cable present) check also for !ivb devices
		* (unless the slave device is pre-ATA3)
		*/

drivers/ide/ide-probe.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -774,9 +774,10 @@ static int ide_probe_port(ide_hwif_t *hwif)
		printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);

		/*
		* Need to probe slave device first to make it release PDIAG-.
		* Second drive should only exist if first drive was found,
		* but a lot of cdrom drives are configured as single slaves.
		*/
		for (unit = MAX_DRIVES - 1; unit >= 0; unit--) {
		for (unit = 0; unit < MAX_DRIVES; ++unit) {
		ide_drive_t *drive = &hwif->drives[unit];
		drive->dn = (hwif->channel ? 2 : 0) + unit;
		(void) probe_for_drive(drive);

Admin message