diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-12 11:42:45 -0400 |
| commit | 8083e1656211eb1487329923d592ee061d08d7b3 (patch) | |
| tree | 92a44787484996b82365fab21f2dec960ab4f2d3 /drivers/scsi/sata_mv.c | |
| parent | 6b12a3d35ff6cb09f8b777ab258ea1e32c680d62 (diff) | |
| parent | 1802ca745280b916cda4090e459741b8c9b3e8d0 (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index 1053c7c76b7..fa38a413d16 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c @@ -1961,8 +1961,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); |