Be a bit more restrictive in the probe so we dont hang around

on empty channels in most cases.
This commit is contained in:
Søren Schmidt 2003-09-18 16:43:08 +00:00
parent 9e9c5a9dc1
commit 228800a5a7

View File

@ -551,11 +551,8 @@ ata_reset(struct ata_channel *ch)
ch->devices |= ATA_ATA_MASTER;
}
}
else if (err == lsb && err == msb) {
ATA_IDX_OUTB(ch, ATA_ERROR, 0xff);
DELAY(10);
if (stat0 == ATA_IDX_INB(ch, ATA_STATUS))
stat0 |= ATA_S_BUSY;
else if ((stat0 & 0x4f) && err == lsb && err == msb) {
stat0 |= ATA_S_BUSY;
}
}
}
@ -579,11 +576,8 @@ ata_reset(struct ata_channel *ch)
ch->devices |= ATA_ATA_SLAVE;
}
}
else if (err == lsb && err == msb) {
ATA_IDX_OUTB(ch, ATA_ERROR, 0xff);
DELAY(10);
if (stat1 == ATA_IDX_INB(ch, ATA_STATUS))
stat1 |= ATA_S_BUSY;
else if ((stat1 & 0x4f) && err == lsb && err == msb) {
stat1 |= ATA_S_BUSY;
}
}
}