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/qlge/qlge_main.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/qlge/qlge_main.c')
-rw-r--r-- | drivers/net/qlge/qlge_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c index 7692299e7826..707b391afa02 100644 --- a/drivers/net/qlge/qlge_main.c +++ b/drivers/net/qlge/qlge_main.c | |||
@@ -2347,8 +2347,8 @@ static int ql_alloc_tx_resources(struct ql_adapter *qdev, | |||
2347 | pci_alloc_consistent(qdev->pdev, tx_ring->wq_size, | 2347 | pci_alloc_consistent(qdev->pdev, tx_ring->wq_size, |
2348 | &tx_ring->wq_base_dma); | 2348 | &tx_ring->wq_base_dma); |
2349 | 2349 | ||
2350 | if ((tx_ring->wq_base == NULL) | 2350 | if ((tx_ring->wq_base == NULL) || |
2351 | || tx_ring->wq_base_dma & WQ_ADDR_ALIGN) { | 2351 | tx_ring->wq_base_dma & WQ_ADDR_ALIGN) { |
2352 | QPRINTK(qdev, IFUP, ERR, "tx_ring alloc failed.\n"); | 2352 | QPRINTK(qdev, IFUP, ERR, "tx_ring alloc failed.\n"); |
2353 | return -ENOMEM; | 2353 | return -ENOMEM; |
2354 | } | 2354 | } |