Commit e0e8ab59 authored by Denis Kirjanov's avatar Denis Kirjanov Committed by David S. Miller

ibmveth: Free irq on error path

Free irq on error path.
Signed-off-by: default avatarDenis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 88426f2a
...@@ -641,7 +641,7 @@ static int ibmveth_open(struct net_device *netdev) ...@@ -641,7 +641,7 @@ static int ibmveth_open(struct net_device *netdev)
if (!adapter->bounce_buffer) { if (!adapter->bounce_buffer) {
netdev_err(netdev, "unable to allocate bounce buffer\n"); netdev_err(netdev, "unable to allocate bounce buffer\n");
rc = -ENOMEM; rc = -ENOMEM;
goto err_out; goto err_out_free_irq;
} }
adapter->bounce_buffer_dma = adapter->bounce_buffer_dma =
dma_map_single(&adapter->vdev->dev, adapter->bounce_buffer, dma_map_single(&adapter->vdev->dev, adapter->bounce_buffer,
...@@ -649,7 +649,7 @@ static int ibmveth_open(struct net_device *netdev) ...@@ -649,7 +649,7 @@ static int ibmveth_open(struct net_device *netdev)
if (dma_mapping_error(dev, adapter->bounce_buffer_dma)) { if (dma_mapping_error(dev, adapter->bounce_buffer_dma)) {
netdev_err(netdev, "unable to map bounce buffer\n"); netdev_err(netdev, "unable to map bounce buffer\n");
rc = -ENOMEM; rc = -ENOMEM;
goto err_out; goto err_out_free_irq;
} }
netdev_dbg(netdev, "initial replenish cycle\n"); netdev_dbg(netdev, "initial replenish cycle\n");
...@@ -661,6 +661,8 @@ static int ibmveth_open(struct net_device *netdev) ...@@ -661,6 +661,8 @@ static int ibmveth_open(struct net_device *netdev)
return 0; return 0;
err_out_free_irq:
free_irq(netdev->irq, netdev);
err_out: err_out:
ibmveth_cleanup(adapter); ibmveth_cleanup(adapter);
napi_disable(&adapter->napi); napi_disable(&adapter->napi);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment