diff options
Diffstat (limited to 'drivers/net/b44.c')
| -rw-r--r-- | drivers/net/b44.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 36d4d377ec2f..bafca672ea7d 100644 --- 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) | |||
| 952 | int rc = NETDEV_TX_OK; | 952 | int rc = NETDEV_TX_OK; |
| 953 | dma_addr_t mapping; | 953 | dma_addr_t mapping; |
| 954 | u32 len, entry, ctrl; | 954 | u32 len, entry, ctrl; |
| 955 | unsigned long flags; | ||
| 955 | 956 | ||
| 956 | len = skb->len; | 957 | len = skb->len; |
| 957 | spin_lock_irq(&bp->lock); | 958 | spin_lock_irqsave(&bp->lock, flags); |
| 958 | 959 | ||
| 959 | /* This is a hard error, log it. */ | 960 | /* This is a hard error, log it. */ |
| 960 | if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) { | 961 | if (unlikely(TX_BUFFS_AVAIL(bp) < 1)) { |
| @@ -1027,7 +1028,7 @@ static int b44_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
| 1027 | dev->trans_start = jiffies; | 1028 | dev->trans_start = jiffies; |
| 1028 | 1029 | ||
| 1029 | out_unlock: | 1030 | out_unlock: |
| 1030 | spin_unlock_irq(&bp->lock); | 1031 | spin_unlock_irqrestore(&bp->lock, flags); |
| 1031 | 1032 | ||
| 1032 | return rc; | 1033 | return rc; |
| 1033 | 1034 | ||
