diff options
| author | Colin Cross <ccross@android.com> | 2011-10-27 15:01:19 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-10-27 15:01:19 -0700 |
| commit | 2bb3e310159b65c88caf0c67a20ed257568be267 (patch) | |
| tree | e4ad01c06a9e27939781c5dd9d0cb92e6fcd54d5 /drivers/misc | |
| parent | 2f53cb72c1574d3880d9e88e254b756565fe2f6d (diff) | |
| parent | 97596c34030ed28657ccafddb67e17a03890b90a (diff) | |
Merge commit 'v3.0.8' into android-3.0
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/lis3lv02d/lis3lv02d.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/misc/lis3lv02d/lis3lv02d.c b/drivers/misc/lis3lv02d/lis3lv02d.c index b928bc14e97b..8b51cd62d067 100644 --- a/drivers/misc/lis3lv02d/lis3lv02d.c +++ b/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, ®); - 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, ®); + 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()); |