projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'pm-runtime'
[linux-2.6-block.git]
/
drivers
/
iio
/
accel
/
kxcjk-1013.c
diff --git
a/drivers/iio/accel/kxcjk-1013.c
b/drivers/iio/accel/kxcjk-1013.c
index 230679f5b9625c08b2d025a574d494b8c42e9fb7..da2fe93739a2e442d136725dd3972f4eeed3a7c3 100644
(file)
--- a/
drivers/iio/accel/kxcjk-1013.c
+++ b/
drivers/iio/accel/kxcjk-1013.c
@@
-269,6
+269,8
@@
static int kxcjk1013_set_range(struct kxcjk1013_data *data, int range_index)
return ret;
}
+ ret &= ~(KXCJK1013_REG_CTRL1_BIT_GSEL0 |
+ KXCJK1013_REG_CTRL1_BIT_GSEL1);
ret |= (KXCJK1013_scale_table[range_index].gsel_0 << 3);
ret |= (KXCJK1013_scale_table[range_index].gsel_1 << 4);