Merge branch 'topic/asoc' into for-linus

[sfrench/cifs-2.6.git] / drivers / net / depca.c

diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index 9301eb28d9e2e04ba2c9cdade16b2b98844c2c61..97ea2d6d3fe16cc5ac72d68739633d9da8bae637 100644 (file)
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -957,7 +957,7 @@ static int depca_start_xmit(struct sk_buff *skb, struct net_device *dev)
                if (TX_BUFFS_AVAIL)
                        netif_start_queue(dev);
        } else
-               status = -1;
+               status = NETDEV_TX_LOCKED;
 
       out:
        return status;
@@ -1839,7 +1839,7 @@ static int load_packet(struct net_device *dev, struct sk_buff *skb)
 
                lp->tx_new = (++end) & lp->txRingMask;  /* update current pointers */
        } else {
-               status = -1;
+               status = NETDEV_TX_LOCKED;
        }
 
        return status;