From 4e306d5e7096cd58568c16c8ecf2a5499fcd860d Mon Sep 17 00:00:00 2001
From: AnilKumar Ch <anilkumar@ti.com>
Date: Wed, 26 Sep 2012 13:58:24 -0700
Subject: [PATCH] --- yaml --- r: 324353 b: refs/heads/master c:
 79df8d27d9f4382647c31ef17f7402833d682b73 h: refs/heads/master i:   324351:
 1bcfbc7da019ee6f787e158b3b6b0ffcb0d4906a v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/misc/lis3lv02d/lis3lv02d_spi.c | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9797014061d5..2760c8d73f85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0c83adba6b117264eb1972d2787dd17874214e9b
+refs/heads/master: 79df8d27d9f4382647c31ef17f7402833d682b73
diff --git a/trunk/drivers/misc/lis3lv02d/lis3lv02d_spi.c b/trunk/drivers/misc/lis3lv02d/lis3lv02d_spi.c
index 4b8ccf200194..ccb6475fa059 100644
--- a/trunk/drivers/misc/lis3lv02d/lis3lv02d_spi.c
+++ b/trunk/drivers/misc/lis3lv02d/lis3lv02d_spi.c
@@ -19,6 +19,7 @@
 #include <linux/pm.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/of_device.h>
 
 #include "lis3lv02d.h"
 
@@ -87,10 +88,13 @@ static int __devinit lis302dl_spi_probe(struct spi_device *spi)
 	lis3_dev.pdata		= spi->dev.platform_data;
 
 #ifdef CONFIG_OF
-	if (of_match_device(lis302dl_spi_dt_ids, &spi->dev))
+	if (of_match_device(lis302dl_spi_dt_ids, &spi->dev)) {
 		lis3_dev.of_node = spi->dev.of_node;
+		ret = lis3lv02d_init_dt(&lis3_dev);
+		if (ret)
+			return ret;
+	}
 #endif
-
 	spi_set_drvdata(spi, &lis3_dev);
 
 	return lis3lv02d_init_device(&lis3_dev);