git.openwrt.org Git - openwrt/staging/pepe2k.git/blob

   1 From 71b8f350a4f03730f3024bfa7dc2414904a21bcb Mon Sep 17 00:00:00 2001
   2 From: Wei Yongjun <weiyongjun1@huawei.com>
   3 Date: Fri, 16 Sep 2016 14:00:19 +0000
   4 Subject: [PATCH] spi: bcm-qspi: Fix error return code in bcm_qspi_probe()
   5
   6 Fix to return a negative error code from the error handling
   7 case instead of 0, as done elsewhere in this function.
   8
   9 Fixes: fa236a7ef240 ("spi: bcm-qspi: Add Broadcom MSPI driver")
  10 Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
  11 Signed-off-by: Mark Brown <broonie@kernel.org>
  12 ---
  13  drivers/spi/spi-bcm-qspi.c | 2 ++
  14  1 file changed, 2 insertions(+)
  15
  16 --- a/drivers/spi/spi-bcm-qspi.c
  17 +++ b/drivers/spi/spi-bcm-qspi.c
  18 @@ -1205,12 +1205,14 @@ int bcm_qspi_probe(struct platform_devic
  19
  20         if (!num_ints) {
  21                 dev_err(&pdev->dev, "no IRQs registered, cannot init driver\n");
  22 +               ret = -EINVAL;
  23                 goto qspi_probe_err;
  24         }
  25
  26         qspi->clk = devm_clk_get(&pdev->dev, NULL);
  27         if (IS_ERR(qspi->clk)) {
  28                 dev_warn(dev, "unable to get clock\n");
  29 +               ret = PTR_ERR(qspi->clk);
  30                 goto qspi_probe_err;
  31         }
  32