Merge branch 'upstream-fixes' into upstream
This commit is contained in:
commit
cea0d336e7
|
@ -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;
|
||||||
|
|
Reference in New Issue