diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-13 23:07:18 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-09-13 23:07:18 +0200 |
| commit | c547fc28ab3e8716076fdaf4bd0260c5d63a18f7 (patch) | |
| tree | 34af1fa64a63618660187ae58ad182665a1861ef /drivers/scsi/sata_mv.c | |
| parent | [POWERPC] Export copy_4K_page() (diff) | |
| parent | Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/... (diff) | |
| download | linux-c547fc28ab3e8716076fdaf4bd0260c5d63a18f7.tar.xz linux-c547fc28ab3e8716076fdaf4bd0260c5d63a18f7.zip | |
Merge branch 'linux-2.6'
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 1053c7c76b7d..fa38a413d16b 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); |