mirror of
https://github.com/torvalds/linux.git
synced 2026-06-07 22:14:04 +02:00
net: altera: set a couple error code in probe()
commitbadd7857f5upstream. There are two error paths which accidentally return success instead of a negative error code. Fixes:bbd2190ce9("Altera TSE: Add main and header file for Altera Ethernet Driver") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
385ffd31eb
commit
83b16b9c44
|
|
@ -1431,16 +1431,19 @@ static int altera_tse_probe(struct platform_device *pdev)
|
||||||
priv->rxdescmem_busaddr = dma_res->start;
|
priv->rxdescmem_busaddr = dma_res->start;
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
ret = -ENODEV;
|
||||||
goto err_free_netdev;
|
goto err_free_netdev;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask)))
|
if (!dma_set_mask(priv->device, DMA_BIT_MASK(priv->dmaops->dmamask))) {
|
||||||
dma_set_coherent_mask(priv->device,
|
dma_set_coherent_mask(priv->device,
|
||||||
DMA_BIT_MASK(priv->dmaops->dmamask));
|
DMA_BIT_MASK(priv->dmaops->dmamask));
|
||||||
else if (!dma_set_mask(priv->device, DMA_BIT_MASK(32)))
|
} else if (!dma_set_mask(priv->device, DMA_BIT_MASK(32))) {
|
||||||
dma_set_coherent_mask(priv->device, DMA_BIT_MASK(32));
|
dma_set_coherent_mask(priv->device, DMA_BIT_MASK(32));
|
||||||
else
|
} else {
|
||||||
|
ret = -EIO;
|
||||||
goto err_free_netdev;
|
goto err_free_netdev;
|
||||||
|
}
|
||||||
|
|
||||||
/* MAC address space */
|
/* MAC address space */
|
||||||
ret = request_and_map(pdev, "control_port", &control_port,
|
ret = request_and_map(pdev, "control_port", &control_port,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user