Skip to content

L
linux-davinci
Commit cea0d336 authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge branch 'upstream-fixes' into upstream

parents c6fd2807 a34b6fc0
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
drivers/ata/libata-core.c
View file @ cea0d336
...@@ -2745,7 +2745,7 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class) ...@@ -2745,7 +2745,7 @@ int sata_std_hardreset(struct ata_port *ap, unsigned int *class)
if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol))) if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol)))
return rc; return rc;
scontrol = (scontrol & 0x0f0) | 0x302; scontrol = (scontrol & 0x0f0) | 0x304;
if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol))) if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol)))
return rc; return rc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment