f5f173e2b7
* fixes NAND * adds latest ethernet patches Signed-off-by: John Crispin <john@phrozen.org>
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
From 8473af12d5aa34613070447d6fd8f785f31301de Mon Sep 17 00:00:00 2001
|
|
From: Arnd Bergmann <arnd@arndb.de>
|
|
Date: Mon, 14 Mar 2016 15:07:11 +0100
|
|
Subject: [PATCH 060/102] net: mediatek: remove incorrect dma_mask assignment
|
|
|
|
Device drivers should not mess with the DMA mask directly,
|
|
but instead call dma_set_mask() etc if needed.
|
|
|
|
In case of the mtk_eth_soc driver, the mask already gets set
|
|
correctly when the device is created, and setting it again
|
|
is against the documented API.
|
|
|
|
This removes the incorrect setting.
|
|
|
|
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
|
|
---
|
|
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 ---
|
|
1 file changed, 3 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
index a005bc4..fcd4ed7 100644
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
|
@@ -1678,9 +1678,6 @@ static int mtk_probe(struct platform_device *pdev)
|
|
struct mtk_eth *eth;
|
|
int err;
|
|
|
|
- pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
|
|
- pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
|
|
-
|
|
device_reset(&pdev->dev);
|
|
|
|
match = of_match_device(of_mtk_match, &pdev->dev);
|
|
--
|
|
1.7.10.4
|
|
|