target/linux/generic/backport-5.4/825-v5.8-spi-rb4xx-null-pointer-bug-fix.patch

   1 From: Christopher Hill <ch6574@gmail.com>
   2 To: Mark Brown <broonie@kernel.org>
   3 Cc: Christopher Hill <ch6574@gmail.com>, linux-spi@vger.kernel.org,
   4         linux-kernel@vger.kernel.org
   5 Subject: [PATCH 1/3] spi: rb4xx: null pointer bug fix
   6 Date: Thu, 21 May 2020 14:36:29 -0400
   7 Message-Id: <20200521183631.37806-1-ch6574@gmail.com>
   8 X-Mailer: git-send-email 2.25.1
   9 MIME-Version: 1.0
  10 Sender: linux-spi-owner@vger.kernel.org
  11 Precedence: bulk
  12 List-ID: <linux-spi.vger.kernel.org>
  13 X-Mailing-List: linux-spi@vger.kernel.org
  14
  15 This patch fixes a null pointer bug in the spi driver spi-rb4xx.c by
  16 moving the private data initialization to earlier in probe
  17
  18 Signed-off-by: Christopher Hill <ch6574@gmail.com>
  19 ---
  20  drivers/spi/spi-rb4xx.c | 10 +++++-----
  21  1 file changed, 5 insertions(+), 5 deletions(-)
  22
  23 diff --git a/drivers/spi/spi-rb4xx.c b/drivers/spi/spi-rb4xx.c
  24 index 4c9620e0d18c..17e1a77dc132 100644
  25 --- a/drivers/spi/spi-rb4xx.c
  26 +++ b/drivers/spi/spi-rb4xx.c
  27 @@ -158,6 +158,11 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
  28         master->transfer_one = rb4xx_transfer_one;
  29         master->set_cs = rb4xx_set_cs;
  30
  31 +       rbspi = spi_master_get_devdata(master);
  32 +       rbspi->base = spi_base;
  33 +       rbspi->clk = ahb_clk;
  34 +       platform_set_drvdata(pdev, rbspi);
  35 +
  36         err = devm_spi_register_master(&pdev->dev, master);
  37         if (err) {
  38                 dev_err(&pdev->dev, "failed to register SPI master\n");
  39 @@ -168,11 +173,6 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
  40         if (err)
  41                 return err;
  42
  43 -       rbspi = spi_master_get_devdata(master);
  44 -       rbspi->base = spi_base;
  45 -       rbspi->clk = ahb_clk;
  46 -       platform_set_drvdata(pdev, rbspi);
  47 -
  48         /* Enable SPI */
  49         rb4xx_write(rbspi, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO);
  50