summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamu Onkalo <samu.p.onkalo@nokia.com>2010-10-22 07:57:28 -0400
committerGuenter Roeck <guenter.roeck@ericsson.com>2010-10-25 14:11:38 -0700
commited37d7f619648bf1a3ac136e80d2d0d647734eb3 (patch)
tree5a52e613fca43ac8e9e8c60140591b29255f121f
parent2a7fade7e03a7c773f91e2e5ff26ad6fafda5a9f (diff)
downloadop-kernel-dev-ed37d7f619648bf1a3ac136e80d2d0d647734eb3.zip
op-kernel-dev-ed37d7f619648bf1a3ac136e80d2d0d647734eb3.tar.gz
hwmon: lis3: restore axis enabled bits
All axis enable bits are set to 0 at module remove. Restore reset default value at init. Signed-off-by: Samu Onkalo <samu.p.onkalo@nokia.com> Acked-by: Eric Piel <eric.piel@tremplin-utc.net> Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
-rw-r--r--drivers/hwmon/lis3lv02d_i2c.c2
-rw-r--r--drivers/hwmon/lis3lv02d_spi.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/lis3lv02d_i2c.c b/drivers/hwmon/lis3lv02d_i2c.c
index ec35c87..c1e7420 100644
--- a/drivers/hwmon/lis3lv02d_i2c.c
+++ b/drivers/hwmon/lis3lv02d_i2c.c
@@ -83,7 +83,7 @@ static int lis3_i2c_init(struct lis3lv02d *lis3)
if (ret < 0)
return ret;
- reg |= CTRL1_PD0;
+ reg |= CTRL1_PD0 | CTRL1_Xen | CTRL1_Yen | CTRL1_Zen;
return lis3->write(lis3, CTRL_REG1, reg);
}
diff --git a/drivers/hwmon/lis3lv02d_spi.c b/drivers/hwmon/lis3lv02d_spi.c
index 955544b..2549de1 100644
--- a/drivers/hwmon/lis3lv02d_spi.c
+++ b/drivers/hwmon/lis3lv02d_spi.c
@@ -50,7 +50,7 @@ static int lis3_spi_init(struct lis3lv02d *lis3)
if (ret < 0)
return ret;
- reg |= CTRL1_PD0;
+ reg |= CTRL1_PD0 | CTRL1_Xen | CTRL1_Yen | CTRL1_Zen;
return lis3->write(lis3, CTRL_REG1, reg);
}
OpenPOWER on IntegriCloud