diff options
| author |   Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> | 2017-05-10 10:28:05 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-11 12:39:34 -0400 |
| commit | 5b6cb43b4d625b04a4049d727a116edbfe5cf0f4 (patch) | |
| tree | 83eb9258e4ea1ba0ee58a40a0067bc4c6bf1cfa7 /drivers/net/ethernet/ti/netcp_core.c | |
| parent | Merge branch 's390-net-fixes' (diff) | |
| download | linux-5b6cb43b4d625b04a4049d727a116edbfe5cf0f4.tar.xz linux-5b6cb43b4d625b04a4049d727a116edbfe5cf0f4.zip | |
net: ethernet: ti: netcp_core: return error while dma channel open issue
Fix error path while dma open channel issue. Also, no need to check output
on NULL if it's never returned.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/ti/netcp_core.c')
| -rw-r--r-- | drivers/net/ethernet/ti/netcp_core.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index 729a7da90b5b..e6222e535019 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c @@ -1353,9 +1353,10 @@ int netcp_txpipe_open(struct netcp_tx_pipe *tx_pipe) tx_pipe->dma_channel = knav_dma_open_channel(dev, tx_pipe->dma_chan_name, &config); - if (IS_ERR_OR_NULL(tx_pipe->dma_channel)) { + if (IS_ERR(tx_pipe->dma_channel)) { dev_err(dev, "failed opening tx chan(%s)\n", tx_pipe->dma_chan_name); + ret = PTR_ERR(tx_pipe->dma_channel); goto err; } @@ -1673,9 +1674,10 @@ static int netcp_setup_navigator_resources(struct net_device *ndev) netcp->rx_channel = knav_dma_open_channel(netcp->netcp_device->device, netcp->dma_chan_name, &config); - if (IS_ERR_OR_NULL(netcp->rx_channel)) { + if (IS_ERR(netcp->rx_channel)) { dev_err(netcp->ndev_dev, "failed opening rx chan(%s\n", netcp->dma_chan_name); + ret = PTR_ERR(netcp->rx_channel); goto fail; } |