diff options
author | John Crispin <john@phrozen.org> | 2016-06-20 22:57:36 +0200 |
---|---|---|
committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-06-20 22:57:36 +0200 |
commit | 97f10c21d271421c8430824d60321dcf3415a0ff (patch) | |
tree | 998a6614b2065fc9de3cfbb396dce7d4a83240d2 /target/linux/mediatek/patches-4.4/0061-net-mediatek-check-device_reset-return-code.patch | |
parent | 2f4fbf7a560f0828748e20f9bdffb68dd331f4b3 (diff) | |
download | master-187ad058-97f10c21d271421c8430824d60321dcf3415a0ff.tar.gz master-187ad058-97f10c21d271421c8430824d60321dcf3415a0ff.tar.bz2 master-187ad058-97f10c21d271421c8430824d60321dcf3415a0ff.zip |
mediatek: update patches
* fixes NAND
* adds latest ethernet patches
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.4/0061-net-mediatek-check-device_reset-return-code.patch')
-rw-r--r-- | target/linux/mediatek/patches-4.4/0061-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/0061-net-mediatek-check-device_reset-return-code.patch b/target/linux/mediatek/patches-4.4/0061-net-mediatek-check-device_reset-return-code.patch new file mode 100644 index 0000000000..f87a3e6724 --- /dev/null +++ b/target/linux/mediatek/patches-4.4/0061-net-mediatek-check-device_reset-return-code.patch @@ -0,0 +1,38 @@ +From 99159791184752ece724b741f9fa6334fdc67123 Mon Sep 17 00:00:00 2001 +From: Arnd Bergmann <arnd@arndb.de> +Date: Mon, 14 Mar 2016 15:07:12 +0100 +Subject: [PATCH 061/102] 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 + |