|
 |
9030b2 |
From 8948eca3e08e2c21b2c0e8ffb6f901e1e811546a Mon Sep 17 00:00:00 2001
|
|
|
9030b2 |
From: Zhang Changzhong <zhangchangzhong@huawei.com>
|
|
|
9030b2 |
Date: Tue, 17 Nov 2020 10:57:55 +0800
|
|
|
9030b2 |
Subject: [PATCH 08/14] atl1e: fix error return code in atl1e_probe()
|
|
|
9030b2 |
Git-commit: 3a36060bf294e7b7e33c5dddcc4f5d2c1c834e56
|
|
|
9030b2 |
Patch-mainline: v5.10-rc5
|
|
|
9030b2 |
References: git-fixes
|
|
|
9030b2 |
|
|
|
9030b2 |
Fix to return a negative error code from the error handling
|
|
|
9030b2 |
case instead of 0, as done elsewhere in this function.
|
|
|
9030b2 |
|
|
|
9030b2 |
Fixes: a6a5325239c2 ("atl1e: Atheros L1E Gigabit Ethernet driver")
|
|
|
9030b2 |
Reported-by: Hulk Robot <hulkci@huawei.com>
|
|
|
9030b2 |
Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
|
|
|
9030b2 |
Link: https://lore.kernel.org/r/1605581875-36281-1-git-send-email-zhangchangzhong@huawei.com
|
|
|
9030b2 |
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
|
9030b2 |
Signed-off-by: Denis Kirjanov <denis.kirjanov@suse.com>
|
|
|
9030b2 |
---
|
|
|
9030b2 |
drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 4 ++--
|
|
|
9030b2 |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
9030b2 |
|
|
|
9030b2 |
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
|
|
|
9030b2 |
index 9c149237d48a..775413547136 100644
|
|
|
9030b2 |
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
|
|
|
9030b2 |
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
|
|
|
9030b2 |
@@ -2315,8 +2315,8 @@ static int atl1e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|
|
9030b2 |
* various kernel subsystems to support the mechanics required by a
|
|
|
9030b2 |
* fixed-high-32-bit system.
|
|
|
9030b2 |
*/
|
|
|
9030b2 |
- if ((dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)) != 0) ||
|
|
|
9030b2 |
- (dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)) != 0)) {
|
|
|
9030b2 |
+ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
|
|
|
9030b2 |
+ if (err) {
|
|
|
9030b2 |
dev_err(&pdev->dev, "No usable DMA configuration,aborting\n");
|
|
|
9030b2 |
goto err_dma;
|
|
|
9030b2 |
}
|
|
|
9030b2 |
--
|
|
|
9030b2 |
2.16.4
|
|
|
9030b2 |
|