target/linux/mediatek/patches-4.4/0056-net-mediatek-check-device_reset-return-code.patch

   1 From b461f1a8dfcf32f289a559b6eba4e784b37d121c Mon Sep 17 00:00:00 2001
   2 From: Arnd Bergmann <arnd@arndb.de>
   3 Date: Mon, 14 Mar 2016 15:07:12 +0100
   4 Subject: [PATCH 56/66] net: mediatek: check device_reset return code
   5
   6 The device_reset() function may fail, so we have to check
   7 its return value, e.g. to make deferred probing work correctly.
   8 gcc warns about it because of the warn_unused_result attribute:
   9
  10 drivers/net/ethernet/mediatek/mtk_eth_soc.c: In function 'mtk_probe':
  11 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]
  12
  13 This adds the trivial error check to propagate the return value
  14 to the generic platform device probe code.
  15
  16 Signed-off-by: Arnd Bergmann <arnd@arndb.de>
  17 ---
  18  drivers/net/ethernet/mediatek/mtk_eth_soc.c |    4 +++-
  19  1 file changed, 3 insertions(+), 1 deletion(-)
  20
  21 diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  22 index fcd4ed7..7f2126b 100644
  23 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  24 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
  25 @@ -1678,7 +1678,9 @@ static int mtk_probe(struct platform_device *pdev)
  26         struct mtk_eth *eth;
  27         int err;
  28
  29 -       device_reset(&pdev->dev);
  30 +       err = device_reset(&pdev->dev);
  31 +       if (err)
  32 +               return err;
  33
  34         match = of_match_device(of_mtk_match, &pdev->dev);
  35         soc = (struct mtk_soc_data *)match->data;
  36 --
  37 1.7.10.4
  38