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

[linux-2.6-block.git] / drivers / net / isa-skeleton.c

diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index 0e71e2a93160d4648942511f8fee6e58246c5e63..04d0502726c07dccb2040395437091a53791222e 100644 (file)
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -214,9 +214,9 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
         * contains the manufacturer's unique code. That might be a good probe
         * method. Ideally you would add additional checks.
         */
-       if (inb(ioaddr + 0) != SA_ADDR0
-               ||       inb(ioaddr + 1) != SA_ADDR1
-               ||       inb(ioaddr + 2) != SA_ADDR2)
+       if (inb(ioaddr + 0) != SA_ADDR0 ||
+           inb(ioaddr + 1) != SA_ADDR1 ||
+           inb(ioaddr + 2) != SA_ADDR2)
                goto out;
 
        if (net_debug  &&  version_printed++ == 0)