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

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

Merge branch 'upstream-fixes' into upstream

parents c6fd2807 a34b6fc0

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2745,7 +2745,7 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class) 
		if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol)))

			return rc;



		scontrol = (scontrol & 0x0f0) | 0x302;

		scontrol = (scontrol & 0x0f0) | 0x304;



		if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol)))

			return rc;