diff options
| author | sos <sos@FreeBSD.org> | 2002-03-14 21:35:55 +0000 |
|---|---|---|
| committer | sos <sos@FreeBSD.org> | 2002-03-14 21:35:55 +0000 |
| commit | 33c882b8149bd2fd9a3fa0b3502aade0e8ba869a (patch) | |
| tree | a908add1c9b52226966728f5b38b4fe45eb17992 /sys/dev/ata/ata-all.c | |
| parent | 81e2a6ab4a0eb935bb14e4dce1b18829a711c289 (diff) | |
| download | FreeBSD-src-33c882b8149bd2fd9a3fa0b3502aade0e8ba869a.zip FreeBSD-src-33c882b8149bd2fd9a3fa0b3502aade0e8ba869a.tar.gz | |
Unbreak the probing of some CDROM drives.
Diffstat (limited to 'sys/dev/ata/ata-all.c')
| -rw-r--r-- | sys/dev/ata/ata-all.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 870c4ea..5ac0510 100644 --- a/sys/dev/ata/ata-all.c +++ b/sys/dev/ata/ata-all.c @@ -419,7 +419,7 @@ ata_getparam(struct ata_device *atadev, u_int8_t command) /* apparently some devices needs this repeated */ do { - if (ata_command(atadev, command, 0, 0, 0, ATA_WAIT_READY)) { + if (ata_command(atadev, command, 0, 0, 0, ATA_WAIT_INTR)) { ata_prtdev(atadev, "%s identify failed\n", command == ATA_C_ATAPI_IDENTIFY ? "ATAPI" : "ATA"); return -1; @@ -646,7 +646,7 @@ ata_start(struct ata_channel *ch) } #endif splx(s); - ch->active = ATA_IDLE; + ATA_UNLOCK_CH(ch); } void @@ -1113,7 +1113,7 @@ ata_change_mode(struct ata_device *atadev, int mode) ATA_SLEEPLOCK_CH(atadev->channel, ATA_ACTIVE); ata_dmainit(atadev->channel, atadev->unit, pmode, wmode, umode); ATA_UNLOCK_CH(atadev->channel); - ata_start(atadev->channel); + ata_start(atadev->channel); /* XXX SOS */ } int |
