diff options
| author | Kyle Manna <kyle@kylemanna.com> | 2011-08-11 22:33:14 -0500 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2011-09-06 16:37:59 +0200 |
| commit | d0e84caeb4cd535923884735906e5730329505b4 (patch) | |
| tree | 409b5168a878ea302d1aeff50c26369da177f000 /drivers/mfd | |
| parent | 66cc5b8e50af87b0bbd0f179d76d2826f4549c13 (diff) | |
| download | linux-3.10-d0e84caeb4cd535923884735906e5730329505b4.tar.gz linux-3.10-d0e84caeb4cd535923884735906e5730329505b4.tar.bz2 linux-3.10-d0e84caeb4cd535923884735906e5730329505b4.zip | |
mfd: Check for twl4030-madc NULL pointer
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>
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 cb44b53dee3..7cbf2aa9e64 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; |