From: Greg Ungerer Date: Tue, 21 Oct 2014 05:57:48 +0000 (+1000) Subject: spi: orion: fix potential NULL pointer de-reference X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9a2d3635524fe80d9e23623b2fe4a2113045f8d8;p=deliverable%2Flinux.git spi: orion: fix potential NULL pointer de-reference It's possible that the call to of_match_device() (introduced in commit df59fa7f ["spi: orion: support armada extended baud rates"]) may return a NULL if there is no match in the device tree (or perhaps no device tree at all). Check the return pointer and set the local device data to the lowest common denominator orion device data if it is NULL. Reported-by: Karl Beldan Signed-off-by: Greg Ungerer Signed-off-by: Mark Brown --- diff --git a/drivers/spi/spi-orion.c b/drivers/spi/spi-orion.c index 835cdda6f4f5..c76b7d7879df 100644 --- a/drivers/spi/spi-orion.c +++ b/drivers/spi/spi-orion.c @@ -454,7 +454,7 @@ static int orion_spi_probe(struct platform_device *pdev) spi->master = master; of_id = of_match_device(orion_spi_of_match_table, &pdev->dev); - devdata = of_id->data; + devdata = (of_id) ? of_id->data : &orion_spi_dev_data; spi->devdata = devdata; spi->clk = devm_clk_get(&pdev->dev, NULL);