---

yaml --- r: 263955 b: refs/heads/master c: d0e84ca h: refs/heads/master i: 263953: 4468679 263951: 8339bc9 v: v3
git-mirror · Sep 6, 2011 · 5730018 · 5730018
1 parent 4ef2177
commit 5730018
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 66cc5b8e50af87b0bbd0f179d76d2826f4549c13
+refs/heads/master: d0e84caeb4cd535923884735906e5730329505b4
diff --git a/trunk/drivers/mfd/twl4030-madc.c b/trunk/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;