git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'topic/soundcore-preclaim' into for-linus
[pandora-kernel.git]
/
drivers
/
net
/
b44.c
diff --git
a/drivers/net/b44.c
b/drivers/net/b44.c
index
36d4d37
..
bafca67
100644
(file)
--- a/
drivers/net/b44.c
+++ b/
drivers/net/b44.c
@@
-952,9
+952,10
@@
static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
int rc = NETDEV_TX_OK;
dma_addr_t mapping;
u32 len, entry, ctrl;
int rc = NETDEV_TX_OK;
dma_addr_t mapping;
u32 len, entry, ctrl;
+ unsigned long flags;
len = skb->len;
len = skb->len;
- spin_lock_irq
(&bp->lock
);
+ spin_lock_irq
save(&bp->lock, flags
);
/* This is a hard error, log it. */
if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) {
/* This is a hard error, log it. */
if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) {
@@
-1027,7
+1028,7
@@
static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev->trans_start = jiffies;
out_unlock:
dev->trans_start = jiffies;
out_unlock:
- spin_unlock_irq
(&bp->lock
);
+ spin_unlock_irq
restore(&bp->lock, flags
);
return rc;
return rc;