diff options
author | Joe Perches <joe@perches.com> | 2009-12-03 02:58:21 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-12-03 16:18:01 -0500 |
commit | 8e95a2026f3b43f7c3d676adaccd2de9532e8dcc (patch) | |
tree | 3733318168cd512480b6db58c5c16d1c8847f0b7 /drivers/net/sunhme.c | |
parent | 3454f835837609d60b29a266e3bd9d701073b060 (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/sunhme.c')
-rw-r--r-- | drivers/net/sunhme.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index 0970e1774d13..6762f1c6ec8a 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c | |||
@@ -3056,9 +3056,9 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, | |||
3056 | int len; | 3056 | int len; |
3057 | 3057 | ||
3058 | if (qfe_slot != -1 && | 3058 | if (qfe_slot != -1 && |
3059 | (addr = of_get_property(dp, | 3059 | (addr = of_get_property(dp, "local-mac-address", &len)) |
3060 | "local-mac-address", &len)) != NULL | 3060 | != NULL && |
3061 | && len == 6) { | 3061 | len == 6) { |
3062 | memcpy(dev->dev_addr, addr, 6); | 3062 | memcpy(dev->dev_addr, addr, 6); |
3063 | } else { | 3063 | } else { |
3064 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); | 3064 | memcpy(dev->dev_addr, idprom->id_ethaddr, 6); |