From 733c2fbdd31f346d3880be1d37faeb49c202bde1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Schmidt?= Date: Thu, 14 Mar 2002 21:35:55 +0000 Subject: [PATCH] Unbreak the probing of some CDROM drives. --- sys/dev/ata/ata-all.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ata/ata-all.c b/sys/dev/ata/ata-all.c index 870c4ea0abfc..5ac05107d482 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