diff options
| author | Jeff Garzik | 2006-08-10 14:29:23 +0200 |
|---|---|---|
| committer | Jeff Garzik | 2006-08-10 14:29:23 +0200 |
| commit | cea0d336e7e139becc9432499e0ba8234ffbed5f (patch) | |
| tree | 14c910c33c3eb79b35a5d3b5ecf7a299d0860b4c /drivers/ata | |
| parent | Move libata to drivers/ata. (diff) | |
| parent | [PATCH] libata: PHY reset requires writing 0x4 to SControl (diff) | |
| download | kernel-qcow2-linux-cea0d336e7e139becc9432499e0ba8234ffbed5f.tar.gz kernel-qcow2-linux-cea0d336e7e139becc9432499e0ba8234ffbed5f.tar.xz kernel-qcow2-linux-cea0d336e7e139becc9432499e0ba8234ffbed5f.zip | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/ata')
| -rw-r--r-- | drivers/ata/libata-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 7d786fba4d82..0ac0b519cf2d 100644 --- 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; |