From cc0ca1a12bfb0023fc505a88917a20365f064419 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 3 Oct 2011 18:09:14 -0700
Subject: [PATCH] --- yaml --- r: 264229 b: refs/heads/master c:
 05faadcf59507e8eea57ffbeea9cbb14c9a2ab3d h: refs/heads/master i:   264227:
 adac67de3da9ecc29d6a0818e5058016eed61f33 v: v3

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

diff --git a/[refs] b/[refs]
index 93e15e68a523..6a60e5f9e1ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f86267b79bc6e357b8606077c7f70239045ea9c
+refs/heads/master: 05faadcf59507e8eea57ffbeea9cbb14c9a2ab3d
diff --git a/trunk/drivers/misc/lis3lv02d/lis3lv02d.c b/trunk/drivers/misc/lis3lv02d/lis3lv02d.c
index b928bc14e97b..8b51cd62d067 100644
--- a/trunk/drivers/misc/lis3lv02d/lis3lv02d.c
+++ b/trunk/drivers/misc/lis3lv02d/lis3lv02d.c
@@ -375,12 +375,14 @@ void lis3lv02d_poweron(struct lis3lv02d *lis3)
 	 *      both have been read. So the value read will always be correct.
 	 * Set BOOT bit to refresh factory tuning values.
 	 */
-	lis3->read(lis3, CTRL_REG2, &reg);
-	if (lis3->whoami ==  WAI_12B)
-		reg |= CTRL2_BDU | CTRL2_BOOT;
-	else
-		reg |= CTRL2_BOOT_8B;
-	lis3->write(lis3, CTRL_REG2, reg);
+	if (lis3->pdata) {
+		lis3->read(lis3, CTRL_REG2, &reg);
+		if (lis3->whoami ==  WAI_12B)
+			reg |= CTRL2_BDU | CTRL2_BOOT;
+		else
+			reg |= CTRL2_BOOT_8B;
+		lis3->write(lis3, CTRL_REG2, reg);
+	}
 
 	/* LIS3 power on delay is quite long */
 	msleep(lis3->pwron_delay / lis3lv02d_get_odr());