aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.4/0056-net-mediatek-check-device_reset-return-code.patch
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2016-04-01 07:11:18 +0000
committerJohn Crispin <john@openwrt.org>2016-04-01 07:11:18 +0000
commit41ba4b04c84a80a441b30e167eab0d45d3b6c009 (patch)
treece7011c8604b5052af66008a7cb361470af41058 /target/linux/mediatek/patches-4.4/0056-net-mediatek-check-device_reset-return-code.patch
parent53a74644b0ec68015abb13ff1e5bd4fe6844bd6e (diff)
downloadupstream-41ba4b04c84a80a441b30e167eab0d45d3b6c009.tar.gz
upstream-41ba4b04c84a80a441b30e167eab0d45d3b6c009.tar.bz2
upstream-41ba4b04c84a80a441b30e167eab0d45d3b6c009.zip
mediatek: update patches
add fixes for * ethernet * cpufreq * nand * a7-timer Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 49098
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0056-net-mediatek-check-device_reset-return-code.patch')
-rw-r--r--target/linux/mediatek/patches-4.4/0056-net-mediatek-check-device_reset-return-code.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/target/linux/mediatek/patches-4.4/0056-net-mediatek-check-device_reset-return-code.patch b/target/linux/mediatek/patches-4.4/0056-net-mediatek-check-device_reset-return-code.patch
deleted file mode 100644
index 00e5c8bfc8..0000000000
--- a/target/linux/mediatek/patches-4.4/0056-net-mediatek-check-device_reset-return-code.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b461f1a8dfcf32f289a559b6eba4e784b37d121c Mon Sep 17 00:00:00 2001
-From: Arnd Bergmann <arnd@arndb.de>
-Date: Mon, 14 Mar 2016 15:07:12 +0100
-Subject: [PATCH 56/66] net: mediatek: check device_reset return code
-
-The device_reset() function may fail, so we have to check
-its return value, e.g. to make deferred probing work correctly.
-gcc warns about it because of the warn_unused_result attribute:
-
-drivers/net/ethernet/mediatek/mtk_eth_soc.c: In function 'mtk_probe':
-drivers/net/ethernet/mediatek/mtk_eth_soc.c:1679:2: error: ignoring return value of 'device_reset', declared with attribute warn_unused_result [-Werror=unused-result]
-
-This adds the trivial error check to propagate the return value
-to the generic platform device probe code.
-
-Signed-off-by: Arnd Bergmann <arnd@arndb.de>
----
- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-index fcd4ed7..7f2126b 100644
---- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -1678,7 +1678,9 @@ static int mtk_probe(struct platform_device *pdev)
- struct mtk_eth *eth;
- int err;
-
-- device_reset(&pdev->dev);
-+ err = device_reset(&pdev->dev);
-+ if (err)
-+ return err;
-
- match = of_match_device(of_mtk_match, &pdev->dev);
- soc = (struct mtk_soc_data *)match->data;
---
-1.7.10.4
-