diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-23 21:35:29 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-23 21:35:28 -0800 |
| commit | e042032335f766c0f69c5ef9e2ba0cbb38e4f51c (patch) | |
| tree | 7498731a7423a41eac48099003ac9cfd6539893d /drivers/net | |
| parent | 9902e5e86535db7917616cc379eab0873b12cf91 (diff) | |
| parent | fcfe80f8cc31bcb80e6cb201b3ab89ba94ebae4e (diff) | |
Merge "mhi: core: Add support for new MHI hardware channel"
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/msm/msm_rmnet_mhi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/msm/msm_rmnet_mhi.c b/drivers/net/ethernet/msm/msm_rmnet_mhi.c index a55a26be4273..50d8e72a96c8 100644 --- a/drivers/net/ethernet/msm/msm_rmnet_mhi.c +++ b/drivers/net/ethernet/msm/msm_rmnet_mhi.c @@ -625,6 +625,9 @@ static int rmnet_mhi_xmit(struct sk_buff *skb, struct net_device *dev) tx_ring_full_count[rmnet_mhi_ptr->dev_index]++; netif_stop_queue(dev); rmnet_log(MSG_VERBOSE, "Stopping Queue\n"); + write_unlock_irqrestore( + &rmnet_mhi_ptr->out_chan_full_lock, + flags); goto rmnet_mhi_xmit_error_cleanup; } else { retry = 1; @@ -652,7 +655,6 @@ static int rmnet_mhi_xmit(struct sk_buff *skb, struct net_device *dev) rmnet_mhi_xmit_error_cleanup: rmnet_log(MSG_VERBOSE, "Ring full\n"); - write_unlock_irqrestore(&rmnet_mhi_ptr->out_chan_full_lock, flags); return NETDEV_TX_BUSY; } |