2020-11-17 03:02:09

by Zhang Changzhong

[permalink] [raw]
Subject: [PATCH net] net: b44: fix error return code in b44_init_one()

Fix to return a negative error code from the error handling
case instead of 0, as done elsewhere in this function.

Fixes: 39a6f4bce6b4 ("b44: replace the ssb_dma API with the generic DMA API")
Reported-by: Hulk Robot <[email protected]>
Signed-off-by: Zhang Changzhong <[email protected]>
---
drivers/net/ethernet/broadcom/b44.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/b44.c b/drivers/net/ethernet/broadcom/b44.c
index 74c1778..b455b60 100644
--- a/drivers/net/ethernet/broadcom/b44.c
+++ b/drivers/net/ethernet/broadcom/b44.c
@@ -2383,7 +2383,8 @@ static int b44_init_one(struct ssb_device *sdev,
goto err_out_free_dev;
}

- if (dma_set_mask_and_coherent(sdev->dma_dev, DMA_BIT_MASK(30))) {
+ err = dma_set_mask_and_coherent(sdev->dma_dev, DMA_BIT_MASK(30));
+ if (err) {
dev_err(sdev->dev,
"Required 30BIT DMA mask unsupported by the system\n");
goto err_out_powerdown;
--
2.9.5


2020-11-17 04:17:12

by Michael Chan

[permalink] [raw]
Subject: Re: [PATCH net] net: b44: fix error return code in b44_init_one()

On Mon, Nov 16, 2020 at 7:01 PM Zhang Changzhong
<[email protected]> wrote:
>
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: 39a6f4bce6b4 ("b44: replace the ssb_dma API with the generic DMA API")
> Reported-by: Hulk Robot <[email protected]>
> Signed-off-by: Zhang Changzhong <[email protected]>

Reviewed-by: Michael Chan <[email protected]>

Thanks.

Attachments:
smime.p7s (4.07 kB)
S/MIME Cryptographic Signature

2020-11-17 18:54:58

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH net] net: b44: fix error return code in b44_init_one()

On Mon, 16 Nov 2020 20:13:43 -0800 Michael Chan wrote:
> On Mon, Nov 16, 2020 at 7:01 PM Zhang Changzhong wrote:
> >
> > Fix to return a negative error code from the error handling
> > case instead of 0, as done elsewhere in this function.
> >
> > Fixes: 39a6f4bce6b4 ("b44: replace the ssb_dma API with the generic DMA API")
> > Reported-by: Hulk Robot <[email protected]>
> > Signed-off-by: Zhang Changzhong <[email protected]>
>
> Reviewed-by: Michael Chan <[email protected]>

Applied, thanks!