X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fhwmon%2Ftwl4030-madc-hwmon.c;h=1a174f0a3cdeb9bd854d13fa61171a63c33e41d7;hb=81a15f2ee56fe725ce68e3cdad982117e261d47d;hp=0018c7dd0097de5045f646d98e715713ea7edba4;hpb=4d39aa1b998fffd481517c1dd03d83c38e1706f9;p=~andy%2Flinux

diff --git a/drivers/hwmon/twl4030-madc-hwmon.c b/drivers/hwmon/twl4030-madc-hwmon.c
index 0018c7dd009..1a174f0a3cd 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;