diff options
| author | Ziyan <jaraidaniel@gmail.com> | 2015-05-07 20:07:24 +0200 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-05-07 20:26:52 +0200 |
| commit | e47e62a291bf7271f2880968e15e2a2b653bde0c (patch) | |
| tree | 69b72083f7e0a096086e6ccf947d5510231d74e7 /drivers/mfd | |
| parent | 753dbd9f2c1a6eadb2ef84e3fd6a075d39c60c4a (diff) | |
| download | kernel_samsung_tuna-e47e62a291bf7271f2880968e15e2a2b653bde0c.tar.gz kernel_samsung_tuna-e47e62a291bf7271f2880968e15e2a2b653bde0c.tar.bz2 kernel_samsung_tuna-e47e62a291bf7271f2880968e15e2a2b653bde0c.zip | |
tuna: fix twl6030 gpadc conversions
Currently, we use the calibrated adc outputs - however,
these are off for tuna (especially for channel 2, breaking headset buttons).
This commit makes the gpadc conversions return the raw values,
which was the pre-gpadc behaviour.
Change-Id: I4ca17d5ce9edd6bd4a67663b6ea90ca05be1f37e
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl6030-gpadc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/twl6030-gpadc.c b/drivers/mfd/twl6030-gpadc.c index 8a337844811..e754d87ef19 100644 --- a/drivers/mfd/twl6030-gpadc.c +++ b/drivers/mfd/twl6030-gpadc.c @@ -866,8 +866,9 @@ int twl6030_get_gpadc_conversion(int channel_no) ret = twl6030_gpadc_conversion(&req); if (ret < 0) return ret; + if (req.rbuf[channel_no] > 0) - temp = req.rbuf[channel_no]; + temp = req.buf[channel_no].raw_code; return temp; } |