From: Jeff Garzik <jgarzik@pobox.com>
Date: Sat, 11 Feb 2006 23:02:04 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Tag: v2.6.18-rc1~1079^2~98^2~13^2~45
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1cb9d721d9df9182a42d1ff59427a100c6522efc;p=linux-2.6-omap-h63xx.git

Merge branch 'upstream'
---

1cb9d721d9df9182a42d1ff59427a100c6522efc
diff --cc drivers/scsi/libata-core.c
index 592d3a86c84,cef85e515c4..3fd55ef5410
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -3553,12 -3394,11 +3564,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
  	 */