projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'renesas-boards-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
spi
/
spi-orion.c
diff --git
a/drivers/spi/spi-orion.c
b/drivers/spi/spi-orion.c
index 835cdda6f4f586d1eb31fccf6904f4203a82ddcd..c76b7d7879dfe6539f80a174ceec9538db4f032c 100644
(file)
--- 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);