Merge remote-tracking branch 'trivial/for-next'

[karo-tx-linux.git] / drivers / net / ethernet / ti / netcp_core.c

diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index 9f9832f0dea9545d619cf335cce22d412ec0d882..37b9b39192ec436c63c7eac55fdddf5060e376d9 100644 (file)
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -1036,7 +1036,7 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp)
        }
 
        desc = knav_pool_desc_get(netcp->tx_pool);
-       if (unlikely(IS_ERR_OR_NULL(desc))) {
+       if (IS_ERR_OR_NULL(desc)) {
                dev_err(netcp->ndev_dev, "out of TX desc\n");
                dma_unmap_single(dev, dma_addr, pkt_len, DMA_TO_DEVICE);
                return NULL;
@@ -1069,7 +1069,7 @@ netcp_tx_map_skb(struct sk_buff *skb, struct netcp_intf *netcp)
                }
 
                ndesc = knav_pool_desc_get(netcp->tx_pool);
-               if (unlikely(IS_ERR_OR_NULL(ndesc))) {
+               if (IS_ERR_OR_NULL(ndesc)) {
                        dev_err(netcp->ndev_dev, "out of TX desc for frags\n");
                        dma_unmap_page(dev, dma_addr, buf_len, DMA_TO_DEVICE);
                        goto free_descs;