diff options
author | John Crispin <john@openwrt.org> | 2016-04-26 11:43:38 +0000 |
---|---|---|
committer | John Crispin <john@openwrt.org> | 2016-04-26 11:43:38 +0000 |
commit | 301d48b8f03c7460efac50007154ab2426db188a (patch) | |
tree | 3b0e00138bd3020f682470e90bcf357cd2529a2f /target/linux/mediatek/patches-4.4/0068-net-mediatek-remove-incorrect-dma_mask-assignment.patch | |
parent | 0a4f2b5920a8c4fa5afc021bc95a6aa781984013 (diff) | |
download | upstream-301d48b8f03c7460efac50007154ab2426db188a.tar.gz upstream-301d48b8f03c7460efac50007154ab2426db188a.tar.bz2 upstream-301d48b8f03c7460efac50007154ab2426db188a.zip |
mediatek: update patches
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 49243
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0068-net-mediatek-remove-incorrect-dma_mask-assignment.patch')
-rw-r--r-- | target/linux/mediatek/patches-4.4/0068-net-mediatek-remove-incorrect-dma_mask-assignment.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.4/0068-net-mediatek-remove-incorrect-dma_mask-assignment.patch b/target/linux/mediatek/patches-4.4/0068-net-mediatek-remove-incorrect-dma_mask-assignment.patch new file mode 100644 index 0000000000..55bc44ad4c --- /dev/null +++ b/target/linux/mediatek/patches-4.4/0068-net-mediatek-remove-incorrect-dma_mask-assignment.patch @@ -0,0 +1,36 @@ +From 6cf7d8453b9ef0a1e51144969141a92dade6b540 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Mon, 14 Mar 2016 15:07:11 +0100 +Subject: [PATCH 68/91] 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 + |