diff options
| author | John Crispin <blogic@openwrt.org> | 2016-04-01 07:11:18 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2016-04-01 07:11:18 +0000 |
| commit | e0707bb7a95d987e72601e2433e2db7b6cb73f94 (patch) | |
| tree | cdb75d14aa3bc84f196961b79284ce37ad263644 /target/linux/mediatek/patches-4.4/0064-net-mediatek-check-device_reset-return-code.patch | |
| parent | 0c025eddb72a09d5417978b0669a8bbfaf7271c3 (diff) | |
| download | master-187ad058-e0707bb7a95d987e72601e2433e2db7b6cb73f94.tar.gz master-187ad058-e0707bb7a95d987e72601e2433e2db7b6cb73f94.tar.bz2 master-187ad058-e0707bb7a95d987e72601e2433e2db7b6cb73f94.zip | |
mediatek: update patches
add fixes for
* ethernet
* cpufreq
* nand
* a7-timer
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@49098 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0064-net-mediatek-check-device_reset-return-code.patch')
| -rw-r--r-- | target/linux/mediatek/patches-4.4/0064-net-mediatek-check-device_reset-return-code.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/target/linux/mediatek/patches-4.4/0064-net-mediatek-check-device_reset-return-code.patch b/target/linux/mediatek/patches-4.4/0064-net-mediatek-check-device_reset-return-code.patch new file mode 100644 index 0000000000..06aab2b205 --- /dev/null +++ b/target/linux/mediatek/patches-4.4/0064-net-mediatek-check-device_reset-return-code.patch @@ -0,0 +1,38 @@ +From e1e7d841480b3a0febdb999fd1c6c4213ee18ea7 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Mon, 14 Mar 2016 15:07:12 +0100 +Subject: [PATCH 64/78] 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 + |