summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2012-06-19 08:00:00 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-02 09:47:25 -0700
commitbc2f6ff9239c013e9ad1ff5a64b86d85d7fc4a3f (patch)
tree8b33c254d503d27e8aa27ed3bbec5979c5157231
parentd344b6d390854d7c5774e550171b75db50a330fe (diff)
downloadlwn-bc2f6ff9239c013e9ad1ff5a64b86d85d7fc4a3f.tar.gz
lwn-bc2f6ff9239c013e9ad1ff5a64b86d85d7fc4a3f.zip
hwmon: (twl4030-madc-hwmon) Initialize uninitialized structure elements
commit 73d7c119255615a26070f9d6cdb722a166a29015 upstream. twl4030_madc_conversion uses do_avg and type structure elements of twl4030_madc_request. Initialize structure to avoid random operation. Fix for: Coverity CID 200794 Uninitialized scalar variable. Cc: Keerthy <j-keerthy@ti.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Jean Delvare <khali@linux-fr.org> Acked-by: Keerthy <j-keerthy@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/hwmon/twl4030-madc-hwmon.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c
index 57240740b161..b6adfac6ca9c 100644
--- a/drivers/hwmon/twl4030-madc-hwmon.c
+++ b/drivers/hwmon/twl4030-madc-hwmon.c
@@ -44,12 +44,13 @@ static ssize_t madc_read(struct device *dev,
struct device_attribute *devattr, char *buf)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
- struct twl4030_madc_request req;
+ struct twl4030_madc_request req = {
+ .channels = 1 << attr->index,
+ .method = TWL4030_MADC_SW2,
+ .type = TWL4030_MADC_WAIT,
+ };
long val;
- req.channels = (1 << attr->index);
- req.method = TWL4030_MADC_SW2;
- req.func_cb = NULL;
val = twl4030_madc_conversion(&req);
if (val < 0)
return val;