Merge branch 'upstream-fixes' into upstream

cea0d336 · Jeff Garzik · c6fd2807 · a34b6fc0 · cea0d336
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

drivers/ata/libata-core.c drivers/ata/libata-core.c +1 -1

未找到文件。
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -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;