renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-20 19:23:57 +08:00
Code

Merge branch 'upstream-fixes' into upstream

Browse Source 
Conflicts:

	drivers/scsi/libata-core.c
This commit is contained in:
Jeff Garzik 2006-05-28 16:32:59 -04:00
commit e42d7be25c
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/scsi/libata-core.c
View File

@ -5021,6 +5021,9 @@ int ata_device_resume(struct ata_device *dev)
if (ap->flags & ATA_FLAG_SUSPENDED) {
struct ata_device *failed_dev;
ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000);
ap->flags &= ~ATA_FLAG_SUSPENDED;
while (ata_set_mode(ap, &failed_dev))
ata_dev_disable(failed_dev);