[PATCH] spi: orion: set devdata properly as it is being used later

From: Muhammad Usama Anjum
Date: Thu Apr 08 2021 - 15:57:35 EST


If device_get_match_data returns NULL, devdata isn't being updated
properly. It is being used later in the function. Both devdata and
spi->devdata should be updated to avoid NULL pointer dereference.

Addresses-Coverity: ("NULL pointer dereference")
Fixes: 0e6521f13c2 ("spi: orion: Use device_get_match_data() helper")
Signed-off-by: Muhammad Usama Anjum <musamaanjum@xxxxxxxxx>
---
drivers/spi/spi-orion.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c
index d02c5c9def20..34b31aba3981 100644
--- a/drivers/spi/spi-orion.c
+++ b/drivers/spi/spi-orion.c
@@ -676,7 +676,8 @@ static int orion_spi_probe(struct platform_device *pdev)
spi->dev = &pdev->dev;

devdata = device_get_match_data(&pdev->dev);
- spi->devdata = devdata ? devdata : &orion_spi_dev_data;
+ devdata = devdata ? devdata : &orion_spi_dev_data;
+ spi->devdata = devdata;

spi->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(spi->clk)) {
--
2.25.1