From 9b6882b0d50776b576b5429be0b64a8f4668a308 Mon Sep 17 00:00:00 2001 From: Albert Lee Date: Mon, 26 Dec 2005 16:48:00 +0800 Subject: [PATCH] --- yaml --- r: 29363 b: refs/heads/master c: 000080c3499cd5037e60c08a8053efb9e48aa9c0 h: refs/heads/master i: 29361: dfe170dc065452dba7aeac495e280325ed084115 29359: 6344fee4a5d52529fc54334187d6c51857830fbd v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 17d39be30a5b..fe32f86fc051 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4f16610081001640ffe0314024bc31c10f69757 +refs/heads/master: 000080c3499cd5037e60c08a8053efb9e48aa9c0 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 41f76b9bf992..911151db8c25 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -3520,11 +3520,12 @@ static void ata_pio_error(struct ata_port *ap) { struct ata_queued_cmd *qc; - printk(KERN_WARNING "ata%u: PIO error\n", ap->id); - qc = ata_qc_from_tag(ap, ap->active_tag); assert(qc != NULL); + if (qc->tf.command != ATA_CMD_PACKET) + printk(KERN_WARNING "ata%u: PIO error\n", ap->id); + /* make sure qc->err_mask is available to * know what's wrong and recover */ @@ -4404,8 +4405,9 @@ inline unsigned int ata_host_intr (struct ata_port *ap, break; case HSM_ST_ERR: - printk(KERN_ERR "ata%u: command error, drv_stat 0x%x host_stat 0x%x\n", - ap->id, status, host_stat); + if (qc->tf.command != ATA_CMD_PACKET) + printk(KERN_ERR "ata%u: command error, drv_stat 0x%x host_stat 0x%x\n", + ap->id, status, host_stat); /* make sure qc->err_mask is available to * know what's wrong and recover