aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-10 08:29:23 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-10 08:29:23 -0400
commitcea0d336e7e139becc9432499e0ba8234ffbed5f (patch)
tree14c910c33c3eb79b35a5d3b5ecf7a299d0860b4c /drivers/ata
parentc6fd280766a050b13360d7c2d59a3d6bd3a27d9a (diff)
parenta34b6fc04d58ad72fe0cc74cd448f4551bd2ebaf (diff)
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c2
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)
2745 if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol))) 2745 if ((rc = sata_scr_read(ap, SCR_CONTROL, &scontrol)))
2746 return rc; 2746 return rc;
2747 2747
2748 scontrol = (scontrol & 0x0f0) | 0x302; 2748 scontrol = (scontrol & 0x0f0) | 0x304;
2749 2749
2750 if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol))) 2750 if ((rc = sata_scr_write(ap, SCR_CONTROL, scontrol)))
2751 return rc; 2751 return rc;