Message ID | 20211203033106.1512770-1-jiasheng@iscas.ac.cn (mailing list archive) |
---|---|
State | Accepted |
Commit | 128f6ec95a282b2d8bc1041e59bf65810703fa44 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [v3] net: bcm4908: Handle dma_set_coherent_mask error codes | expand |
On 12/2/2021 7:31 PM, Jiasheng Jiang wrote: > The return value of dma_set_coherent_mask() is not always 0. > To catch the exception in case that dma is not support the mask. > > Fixes: 9d61d138ab30 ("net: broadcom: rename BCM4908 driver & update DT binding") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> Acked-by: Florian Fainelli <f.fainelli@gmail.com> Thanks for the quick turnaround.
Hello: This patch was applied to netdev/net.git (master) by David S. Miller <davem@davemloft.net>: On Fri, 3 Dec 2021 11:31:06 +0800 you wrote: > The return value of dma_set_coherent_mask() is not always 0. > To catch the exception in case that dma is not support the mask. > > Fixes: 9d61d138ab30 ("net: broadcom: rename BCM4908 driver & update DT binding") > Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> > --- > Changelog > > [...] Here is the summary with links: - [v3] net: bcm4908: Handle dma_set_coherent_mask error codes https://git.kernel.org/netdev/net/c/128f6ec95a28 You are awesome, thank you!
diff --git a/drivers/net/ethernet/broadcom/bcm4908_enet.c b/drivers/net/ethernet/broadcom/bcm4908_enet.c index 02a569500234..376f81796a29 100644 --- a/drivers/net/ethernet/broadcom/bcm4908_enet.c +++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c @@ -708,7 +708,9 @@ static int bcm4908_enet_probe(struct platform_device *pdev) enet->irq_tx = platform_get_irq_byname(pdev, "tx"); - dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); + err = dma_set_coherent_mask(dev, DMA_BIT_MASK(32)); + if (err) + return err; err = bcm4908_enet_dma_alloc(enet); if (err)
The return value of dma_set_coherent_mask() is not always 0. To catch the exception in case that dma is not support the mask. Fixes: 9d61d138ab30 ("net: broadcom: rename BCM4908 driver & update DT binding") Signed-off-by: Jiasheng Jiang <jiasheng@iscas.ac.cn> --- Changelog v2 -> v3 * Change 1. Modify the subject. --- drivers/net/ethernet/broadcom/bcm4908_enet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)