Merge branch 'upstream-fixes' into upstream

This commit is contained in:
Jeff Garzik 2006-08-10 08:29:23 -04:00
commit cea0d336e7

View File

@ -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;