| b.liu | e958203 | 2025-04-17 19:18:16 +0800 | [diff] [blame^] | 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 | --- a/drivers/spi/spi-rb4xx.c |
| 24 | +++ b/drivers/spi/spi-rb4xx.c |
| 25 | @@ -158,6 +158,11 @@ static int rb4xx_spi_probe(struct platfo |
| 26 | master->transfer_one = rb4xx_transfer_one; |
| 27 | master->set_cs = rb4xx_set_cs; |
| 28 | |
| 29 | + rbspi = spi_master_get_devdata(master); |
| 30 | + rbspi->base = spi_base; |
| 31 | + rbspi->clk = ahb_clk; |
| 32 | + platform_set_drvdata(pdev, rbspi); |
| 33 | + |
| 34 | err = devm_spi_register_master(&pdev->dev, master); |
| 35 | if (err) { |
| 36 | dev_err(&pdev->dev, "failed to register SPI master\n"); |
| 37 | @@ -168,11 +173,6 @@ static int rb4xx_spi_probe(struct platfo |
| 38 | if (err) |
| 39 | return err; |
| 40 | |
| 41 | - rbspi = spi_master_get_devdata(master); |
| 42 | - rbspi->base = spi_base; |
| 43 | - rbspi->clk = ahb_clk; |
| 44 | - platform_set_drvdata(pdev, rbspi); |
| 45 | - |
| 46 | /* Enable SPI */ |
| 47 | rb4xx_write(rbspi, AR71XX_SPI_REG_FS, AR71XX_SPI_FS_GPIO); |
| 48 | |