diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-03 14:33:42 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-03 14:33:42 -0700 |
| commit | 3bb5da3837cc1aa17736b05139c9a22c3794851a (patch) | |
| tree | c92d5684a866542b1cb20641607ac1643ce03a47 /drivers/ide/ide-probe.c | |
| parent | 7feb49c82a74bc7c091b8ab2a3f96baa33d08ece (diff) | |
| parent | 9597362d354f8655ece324b01d0c640a0e99c077 (diff) | |
| download | op-kernel-dev-3bb5da3837cc1aa17736b05139c9a22c3794851a.zip op-kernel-dev-3bb5da3837cc1aa17736b05139c9a22c3794851a.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 194ecb0..47a1149 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -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); |
