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
This commit is contained in:
commit
d9ec5ad24c
|
@ -4297,6 +4297,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)
|
int ata_device_resume(struct ata_port *ap, struct ata_device *dev)
|
||||||
{
|
{
|
||||||
if (ap->flags & ATA_FLAG_SUSPENDED) {
|
if (ap->flags & ATA_FLAG_SUSPENDED) {
|
||||||
|
ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 200000);
|
||||||
ap->flags &= ~ATA_FLAG_SUSPENDED;
|
ap->flags &= ~ATA_FLAG_SUSPENDED;
|
||||||
ata_set_mode(ap);
|
ata_set_mode(ap);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue