Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6] / arch / mips / sgi-ip22 / ip22-platform.c

diff --git a/arch/mips/sgi-ip22/ip22-platform.c b/arch/mips/sgi-ip22/ip22-platform.c
index 78b608d2d4e1d46e94624a13d4862a19547c0d42..28ffec8e5d1ae9d26f34904f6bb54146e8a294f9 100644 (file)
--- a/arch/mips/sgi-ip22/ip22-platform.c
+++ b/arch/mips/sgi-ip22/ip22-platform.c
@@ -150,8 +150,8 @@ static int __init sgiseeq_devinit(void)
                return res;
 
        /* Second HPC is missing? */
-       if (ip22_is_fullhouse() ||
-           !get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
+       if (!ip22_is_fullhouse() ||
+           get_dbe(tmp, (unsigned int *)&hpc3c1->pbdma[1]))
                return 0;
 
        sgimc->giopar |= SGIMC_GIOPAR_MASTEREXP1 | SGIMC_GIOPAR_EXP164 |