diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-11 08:54:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-11 08:54:55 -0400 |
| commit | dd1dc802368154a75926491092ec9e6a939c32df (patch) | |
| tree | d30356622b57f9d993ff1c54a621c2d1f8cd31d9 /drivers/ata/sata_mv.c | |
| parent | 406176ee7ef81cec3f346ecd41286a67148e3b0c (diff) | |
| parent | 6708374178d225ef77571ed23b30e8a93c36add5 (diff) | |
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.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 34f1939b44c9..fdce6e07ecd2 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -1960,8 +1960,7 @@ comreset_retry: | |||
| 1960 | timeout = jiffies + msecs_to_jiffies(200); | 1960 | timeout = jiffies + msecs_to_jiffies(200); |
| 1961 | do { | 1961 | do { |
| 1962 | sata_scr_read(ap, SCR_STATUS, &sstatus); | 1962 | sata_scr_read(ap, SCR_STATUS, &sstatus); |
| 1963 | sstatus &= 0x3; | 1963 | if (((sstatus & 0x3) == 3) || ((sstatus & 0x3) == 0)) |
| 1964 | if ((sstatus == 3) || (sstatus == 0)) | ||
| 1965 | break; | 1964 | break; |
| 1966 | 1965 | ||
| 1967 | __msleep(1, can_sleep); | 1966 | __msleep(1, can_sleep); |