From 573001803e8db4356f1002919ffc2882c1be05b3 Mon Sep 17 00:00:00 2001
From: Kyle Manna <kyle@kylemanna.com>
Date: Thu, 11 Aug 2011 22:33:14 -0500
Subject: [PATCH] --- yaml --- r: 263955 b: refs/heads/master c:
 d0e84caeb4cd535923884735906e5730329505b4 h: refs/heads/master i:   263953:
 446867929931a8dc7080da7ab1f22f697959b5e2   263951:
 8339bc957234da1b8ff1f39ac2dc1f1422868a9d v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/mfd/twl4030-madc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 35fb78038a4f..94ee603e045e 100644
--- 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
index cb44b53dee35..7cbf2aa9e64f 100644
--- 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;