From: Jeff Garzik <jgarzik@pobox.com>
Date: Thu, 9 Feb 2006 09:28:13 +0000 (-0500)
Subject: Merge branch 'upstream'
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed;p=linux-edison.git

Merge branch 'upstream'
---

99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed
diff --cc drivers/scsi/libata-core.c
index ff31b0b6a6b,14cdbb336dd..c93bb1bd333
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -1073,9 -1072,17 +1073,10 @@@ static unsigned int ata_pio_modes(cons
  }
  
  static inline void
 -ata_queue_packet_task(struct ata_port *ap)
 -{
 -	if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
 -		queue_work(ata_wq, &ap->packet_task);
 -}
 -
 -static inline void
  ata_queue_pio_task(struct ata_port *ap)
  {
- 	queue_work(ata_wq, &ap->pio_task);
+ 	if (!(ap->flags & ATA_FLAG_FLUSH_PIO_TASK))
+ 		queue_work(ata_wq, &ap->pio_task);
  }
  
  static inline void