diff options
| author | Kyle Manna <kyle@kylemanna.com> | 2011-08-11 22:33:14 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2012-01-06 14:14:11 -0800 |
| commit | b5e0e13b29aa292a2ece89a78757a55e85e9e626 (patch) | |
| tree | 0ec00b1c86e16003117559356799acfe62d2e986 /drivers/mfd | |
| parent | 3ad5a4fbba0c5c863b0a42e2a6a5007de76d3102 (diff) | |
| download | kernel_samsung_smdk4412-b5e0e13b29aa292a2ece89a78757a55e85e9e626.zip kernel_samsung_smdk4412-b5e0e13b29aa292a2ece89a78757a55e85e9e626.tar.gz kernel_samsung_smdk4412-b5e0e13b29aa292a2ece89a78757a55e85e9e626.tar.bz2 | |
mfd: Check for twl4030-madc NULL pointer
commit d0e84caeb4cd535923884735906e5730329505b4 upstream.
If the twl4030-madc device wasn't registered, and another device, such
as twl4030-madc-hwmon, calls twl4030_madc_conversion() a NULL pointer is
dereferenced.
Signed-off-by: Kyle Manna <kyle@kylemanna.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/twl4030-madc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-madc.c b/drivers/mfd/twl4030-madc.c index cb44b53..7cbf2aa 100644 --- a/drivers/mfd/twl4030-madc.c +++ b/drivers/mfd/twl4030-madc.c @@ -510,8 +510,9 @@ int twl4030_madc_conversion(struct twl4030_madc_request *req) u8 ch_msb, ch_lsb; int ret; - if (!req) + if (!req || !twl4030_madc) return -EINVAL; + mutex_lock(&twl4030_madc->lock); if (req->method < TWL4030_MADC_RT || req->method > TWL4030_MADC_SW2) { ret = -EINVAL; |