diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-28 19:35:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-28 19:35:52 -0400 |
| commit | d9ec5ad24ce80b7ef69a0717363db661d13aada5 (patch) | |
| tree | 0a808684e7d5e61427ccd0ecb7f3849164a32aef /drivers | |
| parent | b82e8005af14b51600714971e0c6420c4e334a50 (diff) | |
| parent | 0737ac895afbfbe210557fa5fbafcca932d5fa7c (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
* 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
[PATCH] the latest consensus libata resume fix
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 fa476e7e0a48..b046ffa22101 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
| @@ -4297,6 +4297,7 @@ static int ata_start_drive(struct ata_port *ap, struct ata_device *dev) | |||
| 4297 | int ata_device_resume(struct ata_port *ap, struct ata_device *dev) | 4297 | int ata_device_resume(struct ata_port *ap, struct ata_device *dev) |
| 4298 | { | 4298 | { |
| 4299 | if (ap->flags & ATA_FLAG_SUSPENDED) { | 4299 | if (ap->flags & ATA_FLAG_SUSPENDED) { |
| 4300 | ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000); | ||
| 4300 | ap->flags &= ~ATA_FLAG_SUSPENDED; | 4301 | ap->flags &= ~ATA_FLAG_SUSPENDED; |
| 4301 | ata_set_mode(ap); | 4302 | ata_set_mode(ap); |
| 4302 | } | 4303 | } |