| Message ID | 1605581875-36281-1-git-send-email-zhangchangzhong@huawei.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [net] atl1e: fix error return code in atl1e_probe() | expand |
Le 17/11/2020 à 03:57, Zhang Changzhong a écrit : > Fix to return a negative error code from the error handling > case instead of 0, as done elsewhere in this function. > > Fixes: 85eb5bc33717 ("net: atheros: switch from 'pci_' to 'dma_' API") Hi, should it have any importance, the Fixes tag is wrong. The issue was already there before 85eb5bc33717 which was just a mechanical update. just my 2c CJ > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > --- > drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c > index 098b032..ff9f96d 100644 > --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c > +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c > @@ -2312,8 +2312,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > * various kernel subsystems to support the mechanics required by a > * fixed-high-32-bit system. > */ > - if ((dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)) != 0) || > - (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)) != 0)) { > + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); > + if (err) { > dev_err(&pdev->dev, "No usable DMA configuration,aborting\n"); > goto err_dma; > }
On 2020/11/18 4:38, Marion & Christophe JAILLET wrote: > > Le 17/11/2020 à 03:57, Zhang Changzhong a écrit : >> Fix to return a negative error code from the error handling >> case instead of 0, as done elsewhere in this function. >> >> Fixes: 85eb5bc33717 ("net: atheros: switch from 'pci_' to 'dma_' API") > Hi, should it have any importance, the Fixes tag is wrong. > > The issue was already there before 85eb5bc33717 which was just a mechanical update. > > just my 2c > > CJ > Thanks for reminding, the correct Fixes tag should be: Fixes: a6a5325239c2 ("atl1e: Atheros L1E Gigabit Ethernet driver"
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Tue, 17 Nov 2020 10:57:55 +0800 you wrote: > Fix to return a negative error code from the error handling > case instead of 0, as done elsewhere in this function. > > Fixes: 85eb5bc33717 ("net: atheros: switch from 'pci_' to 'dma_' API") > Reported-by: Hulk Robot <hulkci@huawei.com> > Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> > > [...] Here is the summary with links: - [net] atl1e: fix error return code in atl1e_probe() https://git.kernel.org/netdev/net/c/3a36060bf294 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c index 098b032..ff9f96d 100644 --- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c +++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c @@ -2312,8 +2312,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) * various kernel subsystems to support the mechanics required by a * fixed-high-32-bit system. */ - if ((dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)) != 0) || - (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)) != 0)) { + err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); + if (err) { dev_err(&pdev->dev, "No usable DMA configuration,aborting\n"); goto err_dma; }
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Fixes: 85eb5bc33717 ("net: atheros: switch from 'pci_' to 'dma_' API") Reported-by: Hulk Robot <hulkci@huawei.com> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> --- drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)