diff mbox

[-next] pch_gbe: fix bogus trylock conversion

Message ID 1461705270-29849-1-git-send-email-fw@strlen.de
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Florian Westphal April 26, 2016, 9:14 p.m. UTC 
Should have converted 'if (trylock)' to 'lock'.

Fixes: a6086a893718db ("drivers: net: remove NETDEV_TX_LOCKED")
Signed-off-by: Florian Westphal <fw@strlen.de>
---
 I re-checked the series and this was the only place where I messed up.

Comments

David Miller April 26, 2016, 9:42 p.m. UTC | #1 
From: Florian Westphal <fw@strlen.de>
Date: Tue, 26 Apr 2016 23:14:30 +0200

> Should have converted 'if (trylock)' to 'lock'.
> 
> Fixes: a6086a893718db ("drivers: net: remove NETDEV_TX_LOCKED")
> Signed-off-by: Florian Westphal <fw@strlen.de>
> ---
>  I re-checked the series and this was the only place where I messed up.

Applied.
diff mbox

Patch

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 4475dcc..ca4add7 100644
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -2137,7 +2137,7 @@  static int pch_gbe_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
 	struct pch_gbe_tx_ring *tx_ring = adapter->tx_ring;
 	unsigned long flags;
 
-	spin_trylock_irqsave(&tx_ring->tx_lock, flags);
+	spin_lock_irqsave(&tx_ring->tx_lock, flags);
 
 	if (unlikely(!PCH_GBE_DESC_UNUSED(tx_ring))) {
 		netif_stop_queue(netdev);