From: Jeff Garzik <jgarzik@pobox.com>
Date: Sun, 30 Oct 2005 06:58:41 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0;p=linux-beck.git

Merge branch 'upstream'
---

fce45c1c8a6b5334fa88bbb9b1496b0699d3fef0
diff --cc drivers/scsi/pdc_adma.c
index 1701e318a9f0,af99feb9d237..309b205820a4
--- a/drivers/scsi/pdc_adma.c
+++ b/drivers/scsi/pdc_adma.c
@@@ -487,10 -487,10 +487,10 @@@ static inline unsigned int adma_intr_mm
  			if (!pp || pp->state != adma_state_mmio)
  				continue;
  			qc = ata_qc_from_tag(ap, ap->active_tag);
 -			if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
 +			if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
  
  				/* check main status, clearing INTRQ */
- 				u8 status = ata_chk_status(ap);
+ 				u8 status = ata_check_status(ap);
  				if ((status & ATA_BUSY))
  					continue;
  				DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",
diff --cc drivers/scsi/sata_qstor.c
index 6e0c749b6cb4,1aaf3304d397..6317a9a96e69
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@@ -429,10 -430,10 +429,10 @@@ static inline unsigned int qs_intr_mmio
  			if (!pp || pp->state != qs_state_mmio)
  				continue;
  			qc = ata_qc_from_tag(ap, ap->active_tag);
 -			if (qc && (!(qc->tf.ctl & ATA_NIEN))) {
 +			if (qc && (!(qc->tf.flags & ATA_TFLAG_POLLING))) {
  
  				/* check main status, clearing INTRQ */
- 				u8 status = ata_chk_status(ap);
+ 				u8 status = ata_check_status(ap);
  				if ((status & ATA_BUSY))
  					continue;
  				DPRINTK("ata%u: protocol %d (dev_stat 0x%X)\n",