From: Viktor Rosendahl <viktor.rosendahl@nokia.com>
Date: Wed, 2 Jul 2008 13:36:36 +0000 (+0300)
Subject: twl4030-madc: Fix arbitrarily initialized function pointer
X-Git-Tag: v2.6.26-omap1~53
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=f91fd98be045bec9c18e13110f22dafd44cb84b5;p=linux-2.6-omap-h63xx.git

twl4030-madc: Fix arbitrarily initialized function pointer

req is an automatic variable and thus we cannot rely on it being initialized to
zero (I am leaving the 0!= NULL discussion aside). Other functions test
if this pointer is NULL, in order to determine whether it is a valid address or
not.

Signed-off-by: Viktor Rosendahl <viktor.rosendahl@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/drivers/i2c/chips/twl4030-madc.c b/drivers/i2c/chips/twl4030-madc.c
index 72b126b7e7a..743db749914 100644
--- a/drivers/i2c/chips/twl4030-madc.c
+++ b/drivers/i2c/chips/twl4030-madc.c
@@ -367,6 +367,7 @@ static int twl4030_madc_ioctl(struct inode *inode, struct file *filp,
 		req.channels = (1<<par.channel);
 		req.do_avg	= par.average;
 		req.method	= TWL4030_MADC_SW1;
+		req.func_cb	= NULL;
 
 		val = twl4030_madc_conversion(&req);
 		if (val <= 0) {