Commit 9a2d3635 authored Oct 21, 2014 by Greg Ungerer Committed by Mark Brown Oct 22, 2014

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 <karl.beldan@gmail.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent f114040e

drivers/spi/spi-orion.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message