linux-ide.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [git patch] libata resume fix
@ 2006-05-28 20:34 Jeff Garzik
  2006-05-29 21:34 ` Benjamin Herrenschmidt
  0 siblings, 1 reply; 10+ messages in thread
From: Jeff Garzik @ 2006-05-28 20:34 UTC (permalink / raw)
  To: Andrew Morton, Linus Torvalds; +Cc: linux-ide, linux-kernel


Please pull from 'upstream-fixes' branch of
master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git

to receive the following updates:

 drivers/scsi/libata-core.c |    1 +
 1 file changed, 1 insertion(+)

Mark Lord:
      the latest consensus libata resume fix

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index fa476e7..b046ffa 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -4297,6 +4297,7 @@ static int ata_start_drive(struct ata_po
 int ata_device_resume(struct ata_port *ap, struct ata_device *dev)
 {
 	if (ap->flags & ATA_FLAG_SUSPENDED) {
+		ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000);
 		ap->flags &= ~ATA_FLAG_SUSPENDED;
 		ata_set_mode(ap);
 	}

^ permalink raw reply related	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2006-05-31 21:59 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-05-28 20:34 [git patch] libata resume fix Jeff Garzik
2006-05-29 21:34 ` Benjamin Herrenschmidt
2006-05-30 13:22   ` Mark Lord
2006-05-30 18:26     ` Linus Torvalds
2006-05-30 18:40       ` Ric Wheeler
2006-05-30 22:37       ` Benjamin Herrenschmidt
2006-05-31  6:47         ` Jens Axboe
2006-05-31  6:56           ` Benjamin Herrenschmidt
2006-05-31 22:01       ` Bill Davidsen
2006-05-30 22:34     ` Benjamin Herrenschmidt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).