Merge tag 'iio-fixes-for-4.2a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23...

[linux-drm-fsl-dcu.git] / drivers / iio / adc / twl4030-madc.c

diff --git a/drivers/iio/adc/twl4030-madc.c b/drivers/iio/adc/twl4030-madc.c
index 4caecbea4c97da41ca942872c463eb86e9b47b55..ebe415f1064000c95c88f5d20da48a7f52f71d84 100644 (file)
--- a/drivers/iio/adc/twl4030-madc.c
+++ b/drivers/iio/adc/twl4030-madc.c
@@ -235,7 +235,7 @@ static int twl4030battery_temperature(int raw_volt)
        if (ret < 0)
                return ret;
 
-       curr = ((val & TWL4030_BCI_ITHEN) + 1) * 10;
+       curr = ((val & TWL4030_BCI_ITHSENS) + 1) * 10;
        /* Getting and calculating the thermistor resistance in ohms */
        res = volt * 1000 / curr;
        /* calculating temperature */
@@ -662,10 +662,8 @@ EXPORT_SYMBOL_GPL(twl4030_get_madc_conversion);
  *
  * @madc:      pointer to twl4030_madc_data struct
  * @chan:      can be one of the two values:
- *             TWL4030_BCI_ITHEN
- *             Enables bias current for main battery type reading
- *             TWL4030_BCI_TYPEN
- *             Enables bias current for main battery temperature sensing
+ *             0 - Enables bias current for main battery type reading
+ *             1 - Enables bias current for main battery temperature sensing
  * @on:                enable or disable chan.
  *
  * Function to enable or disable bias current for