| From: Christopher Hill <ch6574@gmail.com> |
| To: Mark Brown <broonie@kernel.org> |
| Cc: Christopher Hill <ch6574@gmail.com>, linux-spi@vger.kernel.org, |
| linux-kernel@vger.kernel.org |
| Subject: [PATCH 1/3] spi: rb4xx: null pointer bug fix |
| Date: Thu, 21 May 2020 14:36:29 -0400 |
| Message-Id: <20200521183631.37806-1-ch6574@gmail.com> |
| X-Mailer: git-send-email 2.25.1 |
| MIME-Version: 1.0 |
| Sender: linux-spi-owner@vger.kernel.org |
| Precedence: bulk |
| List-ID: <linux-spi.vger.kernel.org> |
| X-Mailing-List: linux-spi@vger.kernel.org |
| |
| This patch fixes a null pointer bug in the spi driver spi-rb4xx.c by |
| moving the private data initialization to earlier in probe |
| |
| Signed-off-by: Christopher Hill <ch6574@gmail.com> |
| --- |
| drivers/spi/spi-rb4xx.c | 10 +++++----- |
| 1 file changed, 5 insertions(+), 5 deletions(-) |
| |
| --- a/drivers/spi/spi-rb4xx.c |
| +++ b/drivers/spi/spi-rb4xx.c |
| @@ -158,6 +158,11 @@ static int rb4xx_spi_probe(struct platfo |
| master->transfer_one = rb4xx_transfer_one; |
| master->set_cs = rb4xx_set_cs; |
| |
| + rbspi = spi_master_get_devdata(master); |
| + rbspi->base = spi_base; |
| + rbspi->clk = ahb_clk; |
| + platform_set_drvdata(pdev, rbspi); |
| + |
| err = devm_spi_register_master(&pdev->dev, master); |
| if (err) { |
| dev_err(&pdev->dev, "failed to register SPI master\n"); |
| @@ -168,11 +173,6 @@ static int rb4xx_spi_probe(struct platfo |
| if (err) |
| return err; |
| |
| - rbspi = spi_master_get_devdata(master); |
| - rbspi->base = spi_base; |
| - rbspi->clk = ahb_clk; |
| - platform_set_drvdata(pdev, rbspi); |
| - |
| /* Enable SPI */ |
| rb4xx_write(rbspi, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO); |
| |