aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/misc/lis3lv02d/lis3lv02d_spi.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
index 4b8ccf200194..ccb6475fa059 100644
--- a/drivers/misc/lis3lv02d/lis3lv02d_spi.c
+++ b/drivers/misc/lis3lv02d/lis3lv02d_spi.c
@@ -19,6 +19,7 @@
19#include <linux/pm.h> 19#include <linux/pm.h>
20#include <linux/of.h> 20#include <linux/of.h>
21#include <linux/of_platform.h> 21#include <linux/of_platform.h>
22#include <linux/of_device.h>
22 23
23#include "lis3lv02d.h" 24#include "lis3lv02d.h"
24 25
@@ -87,10 +88,13 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
87 lis3_dev.pdata = spi->dev.platform_data; 88 lis3_dev.pdata = spi->dev.platform_data;
88 89
89#ifdef CONFIG_OF 90#ifdef CONFIG_OF
90 if (of_match_device(lis302dl_spi_dt_ids, &spi->dev)) 91 if (of_match_device(lis302dl_spi_dt_ids, &spi->dev)) {
91 lis3_dev.of_node = spi->dev.of_node; 92 lis3_dev.of_node = spi->dev.of_node;
93 ret = lis3lv02d_init_dt(&lis3_dev);
94 if (ret)
95 return ret;
96 }
92#endif 97#endif
93
94 spi_set_drvdata(spi, &lis3_dev); 98 spi_set_drvdata(spi, &lis3_dev);
95 99
96 return lis3lv02d_init_device(&lis3_dev); 100 return lis3lv02d_init_device(&lis3_dev);