Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / drivers / net / ethernet / ibm / ibmveth.c

diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index c859771a9902e21e2f5e03a7c0901c06788e6172..302d594010652d829f5cc73d0b7b0df7ebaebf80 100644 (file)
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -556,11 +556,9 @@ static int ibmveth_open(struct net_device *netdev)
        adapter->rx_queue.queue_len = sizeof(struct ibmveth_rx_q_entry) *
                                                rxq_entries;
        adapter->rx_queue.queue_addr =
-           dma_alloc_coherent(dev, adapter->rx_queue.queue_len,
-                              &adapter->rx_queue.queue_dma, GFP_KERNEL);
-
+               dma_alloc_coherent(dev, adapter->rx_queue.queue_len,
+                                  &adapter->rx_queue.queue_dma, GFP_KERNEL);
        if (!adapter->rx_queue.queue_addr) {
-               netdev_err(netdev, "unable to allocate rx queue pages\n");
                rc = -ENOMEM;
                goto err_out;
        }