aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/e2100.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2009-12-03 02:58:21 -0500
committerDavid S. Miller <davem@davemloft.net>2009-12-03 16:18:01 -0500
commit8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch)
tree3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/e2100.c
parent3454f835837609d60b29a266e3bd9d701073b060 (diff)
drivers/net: Move && and || to end of previous line
Only files where David Miller is the primary git-signer. wireless, wimax, ixgbe, etc are not modified. Compile tested x86 allyesconfig only Not all files compiled (not x86 compatible) Added a few > 80 column lines, which I ignored. Existing checkpatch complaints ignored. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/e2100.c')
-rw-r--r--drivers/net/e2100.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/e2100.c b/drivers/net/e2100.c
index d2f6ee1a6290..ca93c9a9d372 100644
--- a/drivers/net/e2100.c
+++ b/drivers/net/e2100.c
@@ -186,9 +186,9 @@ static int __init e21_probe1(struct net_device *dev, int ioaddr)
186 return -EBUSY; 186 return -EBUSY;
187 187
188 /* First check the station address for the Ctron prefix. */ 188 /* First check the station address for the Ctron prefix. */
189 if (inb(ioaddr + E21_SAPROM + 0) != 0x00 189 if (inb(ioaddr + E21_SAPROM + 0) != 0x00 ||
190 || inb(ioaddr + E21_SAPROM + 1) != 0x00 190 inb(ioaddr + E21_SAPROM + 1) != 0x00 ||
191 || inb(ioaddr + E21_SAPROM + 2) != 0x1d) { 191 inb(ioaddr + E21_SAPROM + 2) != 0x1d) {
192 retval = -ENODEV; 192 retval = -ENODEV;
193 goto out; 193 goto out;
194 } 194 }