Merge commit 'origin/master' into next

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c
index 91a9b1a33764..ceb6a9c357ad 100644
--- a/drivers/net/ethoc.c
+++ b/drivers/net/ethoc.c
@@ -811,7 +811,7 @@ static int ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
         if (unlikely(skb->len > ETHOC_BUFSIZ)) {
                 priv->stats.tx_errors++;
-                return -EMSGSIZE;
+                goto out;
         }
 
         entry = priv->cur_tx % priv->num_tx;
@@ -840,9 +840,9 @@ static int ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
         }
 
         dev->trans_start = jiffies;
-        dev_kfree_skb(skb);
-
         spin_unlock_irq(&priv->lock);
+out:
+        dev_kfree_skb(skb);
         return NETDEV_TX_OK;
 }