From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 20 Feb 2006 07:16:23 +0000 (-0500)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.17-rc1~1182^2~58
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b;p=linux-2.6-omap-h63xx.git

Merge branch 'master'
---

5b2ffed906a3ebd4e52a5bbef06b99a517c53e4b
diff --cc drivers/scsi/libata-core.c
index 61cba39a683,7ddd5a69352..adc5b440c9b
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -3426,11 -3357,12 +3426,12 @@@ static void ata_pio_error(struct ata_po
  {
  	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);
 +	WARN_ON(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
  	 */