From 4ddb46fac69b107610247b81ae8e258cb4fe9240 Mon Sep 17 00:00:00 2001
From: Tilman Schmidt <tilman@imap.cc>
Date: Sun, 23 May 2010 01:02:08 +0000
Subject: [PATCH] --- yaml --- r: 198588 b: refs/heads/master c:
 85a83560afa69862639fb2d6f670b4440a003335 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/isdn/capi/kcapi.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 84ac56ab6130..8a4d50c1edfa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5e93151e4390e4d27bee27ddb73f78f58260594
+refs/heads/master: 85a83560afa69862639fb2d6f670b4440a003335
diff --git a/trunk/drivers/isdn/capi/kcapi.c b/trunk/drivers/isdn/capi/kcapi.c
index bd00dceacaf0..bde3c88b8b27 100644
--- a/trunk/drivers/isdn/capi/kcapi.c
+++ b/trunk/drivers/isdn/capi/kcapi.c
@@ -1147,6 +1147,12 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data)
 		if (ctr->state == CAPI_CTR_DETECTED)
 			goto reset_unlock_out;
 
+		if (ctr->reset_ctr == NULL) {
+			printk(KERN_DEBUG "kcapi: reset: no reset function\n");
+			retval = -ESRCH;
+			goto reset_unlock_out;
+		}
+
 		ctr->reset_ctr(ctr);
 
 		retval = wait_on_ctr_state(ctr, CAPI_CTR_DETECTED);