Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[sfrench/cifs-2.6.git] / drivers / net / tulip / 21142.c

diff --git a/drivers/net/tulip/21142.c b/drivers/net/tulip/21142.c
index db7d5e11855d009b07aeb8a3e247c69e3f45a8ed..9f6742fad6ca8da29bc14ed5d379f2841d540190 100644 (file)
--- a/drivers/net/tulip/21142.c
+++ b/drivers/net/tulip/21142.c
@@ -209,10 +209,10 @@ void t21142_lnk_change(struct net_device *dev, int csr5)
                        printk(KERN_DEBUG "%s:  Setting CSR6 %8.8x/%x CSR12 %8.8x.\n",
                                   dev->name, tp->csr6, ioread32(ioaddr + CSR6),
                                   ioread32(ioaddr + CSR12));
-       } else if ((tp->nwayset  &&  (csr5 & 0x08000000)
-                               && (dev->if_port == 3  ||  dev->if_port == 5)
-                               && (csr12 & 2) == 2) ||
-                          (tp->nway && (csr5 & (TPLnkFail)))) {
+       } else if ((tp->nwayset  &&  (csr5 & 0x08000000) &&
+                   (dev->if_port == 3  ||  dev->if_port == 5) &&
+                   (csr12 & 2) == 2) ||
+                  (tp->nway && (csr5 & (TPLnkFail)))) {
                /* Link blew? Maybe restart NWay. */
                del_timer_sync(&tp->timer);
                t21142_start_nway(dev);