1 files changed, 24 insertions, 17 deletions

diff --git a/drivers/isdn/capi/kcapi_proc.c b/drivers/isdn/capi/kcapi_proc.c
index 09d4db764d22..ea2dff602e49 100644
--- a/drivers/isdn/capi/kcapi_proc.c
+++ b/drivers/isdn/capi/kcapi_proc.c
@@ -15,13 +15,12 @@
 #include <linux/seq_file.h>
 #include <linux/init.h>
 
-static char *
-cardstate2str(unsigned short cardstate)
+static char *state2str(unsigned short state)
 {
-        switch (cardstate) {
-        case CARD_DETECTED:     return "detected";
-        case CARD_LOADING:      return "loading";
-        case CARD_RUNNING:      return "running";
+        switch (state) {
+        case CAPI_CTR_DETECTED: return "detected";
+        case CAPI_CTR_LOADING:  return "loading";
+        case CAPI_CTR_RUNNING:  return "running";
         default:                return "???";
         }
 }
@@ -36,9 +35,12 @@ cardstate2str(unsigned short cardstate)
 // ---------------------------------------------------------------------------
 
 static void *controller_start(struct seq_file *seq, loff_t *pos)
+        __acquires(capi_controller_lock)
 {
+        mutex_lock(&capi_controller_lock);
+
         if (*pos < CAPI_MAXCONTR)
-                return &capi_cards[*pos];
+                return &capi_controller[*pos];
 
         return NULL;
 }
@@ -47,13 +49,15 @@ static void *controller_next(struct seq_file *seq, void *v, loff_t *pos)
 {
         ++*pos;
         if (*pos < CAPI_MAXCONTR)
-                return &capi_cards[*pos];
+                return &capi_controller[*pos];
 
         return NULL;
 }
 
 static void controller_stop(struct seq_file *seq, void *v)
+        __releases(capi_controller_lock)
 {
+        mutex_unlock(&capi_controller_lock);
 }
 
 static int controller_show(struct seq_file *seq, void *v)
@@ -65,7 +69,7 @@ static int controller_show(struct seq_file *seq, void *v)
 
         seq_printf(seq, "%d %-10s %-8s %-16s %s\n",
                    ctr->cnr, ctr->driver_name,
-                   cardstate2str(ctr->cardstate),
+                   state2str(ctr->state),
                    ctr->name,
                    ctr->procinfo ?  ctr->procinfo(ctr) : "");
 
@@ -135,9 +139,11 @@ static const struct file_operations proc_contrstats_ops = {
 //      applid nrecvctlpkt nrecvdatapkt nsentctlpkt nsentdatapkt
 // ---------------------------------------------------------------------------
 
-static void *
-applications_start(struct seq_file *seq, loff_t *pos)
+static void *applications_start(struct seq_file *seq, loff_t *pos)
+        __acquires(capi_controller_lock)
 {
+        mutex_lock(&capi_controller_lock);
+
         if (*pos < CAPI_MAXAPPL)
                 return &capi_applications[*pos];
 
@@ -154,9 +160,10 @@ applications_next(struct seq_file *seq, void *v, loff_t *pos)
         return NULL;
 }
 
-static void
-applications_stop(struct seq_file *seq, void *v)
+static void applications_stop(struct seq_file *seq, void *v)
+        __releases(capi_controller_lock)
 {
+        mutex_unlock(&capi_controller_lock);
 }
 
 static int
@@ -239,9 +246,9 @@ static const struct file_operations proc_applstats_ops = {
 // ---------------------------------------------------------------------------
 
 static void *capi_driver_start(struct seq_file *seq, loff_t *pos)
-        __acquires(&capi_drivers_list_lock)
+        __acquires(&capi_drivers_lock)
 {
-        read_lock(&capi_drivers_list_lock);
+        mutex_lock(&capi_drivers_lock);
         return seq_list_start(&capi_drivers, *pos);
 }
 
@@ -251,9 +258,9 @@ static void *capi_driver_next(struct seq_file *seq, void *v, loff_t *pos)
 }
 
 static void capi_driver_stop(struct seq_file *seq, void *v)
-        __releases(&capi_drivers_list_lock)
+        __releases(&capi_drivers_lock)
 {
-        read_unlock(&capi_drivers_list_lock);
+        mutex_unlock(&capi_drivers_lock);
 }
 
 static int capi_driver_show(struct seq_file *seq, void *v)