mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-11-26 18:20:53 +07:00
Merge branch 'upstream-fixes' into upstream
Conflicts: drivers/scsi/libata-core.c
This commit is contained in:
commit
e42d7be25c
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user