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

Commit e42d7be2 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream-fixes' into upstream 

Conflicts:

	drivers/scsi/libata-core.c
parents 75e99585 0737ac89

drivers/scsi/libata-core.c

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