| From foo@baz Sun Nov 22 12:00:04 PM CET 2020 |
| From: Zhang Changzhong <zhangchangzhong@huawei.com> |
| Date: Tue, 17 Nov 2020 11:02:11 +0800 |
| Subject: net: b44: fix error return code in b44_init_one() |
| |
| From: Zhang Changzhong <zhangchangzhong@huawei.com> |
| |
| [ Upstream commit 7b027c249da54f492699c43e26cba486cfd48035 ] |
| |
| 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 <hulkci@huawei.com> |
| Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> |
| Reviewed-by: Michael Chan <michael.chan@broadcom.com> |
| Link: https://lore.kernel.org/r/1605582131-36735-1-git-send-email-zhangchangzhong@huawei.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/broadcom/b44.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/net/ethernet/broadcom/b44.c |
| +++ b/drivers/net/ethernet/broadcom/b44.c |
| @@ -2389,7 +2389,8 @@ static int b44_init_one(struct ssb_devic |
| 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; |
