git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fix/hda' of git://github.com/tiwai/sound
[pandora-kernel.git]
/
drivers
/
mfd
/
twl4030-madc.c
diff --git
a/drivers/mfd/twl4030-madc.c
b/drivers/mfd/twl4030-madc.c
index
cb44b53
..
7cbf2aa
100644
(file)
--- 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;