Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9ec5ad2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b82e8005 0737ac89

drivers/scsi/libata-core.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -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);

	}

	}