aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata/sata_mv.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-11 08:54:55 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-11 08:54:55 -0400
commitdd1dc802368154a75926491092ec9e6a939c32df (patch)
treed30356622b57f9d993ff1c54a621c2d1f8cd31d9 /drivers/ata/sata_mv.c
parent406176ee7ef81cec3f346ecd41286a67148e3b0c (diff)
parent6708374178d225ef77571ed23b30e8a93c36add5 (diff)
downloadkernel_samsung_tuna-dd1dc802368154a75926491092ec9e6a939c32df.zip
kernel_samsung_tuna-dd1dc802368154a75926491092ec9e6a939c32df.tar.gz
kernel_samsung_tuna-dd1dc802368154a75926491092ec9e6a939c32df.tar.bz2
Merge branch 'upstream-fixes' into upstream
Conflicts: drivers/ata/ata_piix.c
Diffstat (limited to 'drivers/ata/sata_mv.c')
-rw-r--r--drivers/ata/sata_mv.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 34f1939..fdce6e0 100644
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1960,8 +1960,7 @@ comreset_retry:
timeout = jiffies + msecs_to_jiffies(200);
do {
sata_scr_read(ap, SCR_STATUS, &sstatus);
- sstatus &= 0x3;
- if ((sstatus == 3) || (sstatus == 0))
+ if (((sstatus & 0x3) == 3) || ((sstatus & 0x3) == 0))
break;
__msleep(1, can_sleep);