diff options
| author | Mark Lord <liml@rtr.ca> | 2006-05-28 11:28:00 -0400 |
|---|---|---|
| committer | Chris Wright <chrisw@sous-sol.org> | 2006-06-05 10:18:14 -0700 |
| commit | 17c384f205082ddfc1bf8bb3cfa63194b7aac5e7 (patch) | |
| tree | 9d7d32e14d26bc27dc13610281313149bb9da34a /drivers | |
| parent | 822dee3afa4f03fc3fa89e5d5794143a909c4e6f (diff) | |
[PATCH] the latest consensus libata resume fix
Okay, just to sum things up.
This forces libata to wait for up to 2 seconds for BUSY|DRQ to clear
on resume before continuing.
[jgarzik adds...] During testing we never saw DRQ asserted, but
nonetheless (a) this works and (b) testing for DRQ won't hurt.
Signed-off-by: Mark Lord <liml@rtr.ca>
Acked-by: Jens Axboe <axboe@suse.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/libata-core.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 4f91b0dc572..400e9d74ad5 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -4293,6 +4293,7 @@ static int ata_start_drive(struct ata_port *ap, struct ata_device *dev) 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); } |