From 4cb5b1f9365857feea0ad62ef7d0db088e61db96 Mon Sep 17 00:00:00 2001 From: Søren Schmidt Date: Fri, 19 Sep 2003 12:46:12 +0000 Subject: Always check the sensekey field on ATAPI returns Add INQUIRY to cmd2str. --- sys/dev/ata/ata-queue.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'sys/dev/ata') diff --git a/sys/dev/ata/ata-queue.c b/sys/dev/ata/ata-queue.c index c282e4c979875..dac66cb8733e9 100644 --- a/sys/dev/ata/ata-queue.c +++ b/sys/dev/ata/ata-queue.c @@ -264,7 +264,7 @@ ata_completed(void *context, int pending) if (request->result) break; - if (request->error & ATA_E_MASK) { + if (request->error) { switch ((request->error & ATA_SK_MASK)) { case ATA_SK_RECOVERED_ERROR: ata_prtdev(request->device, "WARNING - %s recovered error\n", @@ -297,6 +297,8 @@ ata_completed(void *context, int pending) "\2NO_MEDIA\1ILLEGAL_LENGTH"); request->result = EIO; } + if (request->error & ATA_E_MASK) + request->result = EIO; } break; } @@ -369,6 +371,7 @@ ata_cmd2str(struct ata_request *request) case 0x0a: return ("WRITE"); case 0x10: return ("WEOF"); case 0x11: return ("SPACE"); + case 0x12: return ("INQUIRY"); case 0x15: return ("MODE_SELECT"); case 0x19: return ("ERASE"); case 0x1a: return ("MODE_SENSE"); -- cgit v1.3