3 files changed, 10 insertions, 24 deletions

diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index 5fcbdccd7a53..16a874bb1561 100644
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -806,7 +806,6 @@ static int DIVA_INIT_FUNCTION divas_init(void)
 
         if (!create_divas_proc()) {
 #ifdef MODULE
-                remove_divas_proc();
                 divas_unregister_chrdev();
                 divasfunc_exit();
 #endif
diff --git a/drivers/isdn/hardware/eicon/divasproc.c b/drivers/isdn/hardware/eicon/divasproc.c
index fae895828a17..040827288ec9 100644
--- a/drivers/isdn/hardware/eicon/divasproc.c
+++ b/drivers/isdn/hardware/eicon/divasproc.c
@@ -125,8 +125,8 @@ static const struct file_operations divas_fops = {
 
 int create_divas_proc(void)
 {
-        proc_create(divas_proc_name, S_IFREG | S_IRUGO, proc_net_eicon,
-                    &divas_fops);
+        divas_proc_entry = proc_create(divas_proc_name, S_IFREG | S_IRUGO,
+                                        proc_net_eicon, &divas_fops);
         if (!divas_proc_entry)
                 return (0);
 
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c
index 15906d005b05..484299b031f8 100644
--- a/drivers/isdn/hysdn/hysdn_procconf.c
+++ b/drivers/isdn/hysdn/hysdn_procconf.c
@@ -207,30 +207,17 @@ hysdn_conf_write(struct file *file, const char __user *buf, size_t count, loff_t
 /* read conf file -> output card info data */
 /*******************************************/
 static ssize_t
-hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t * off)
+hysdn_conf_read(struct file *file, char __user *buf, size_t count, loff_t *off)
 {
         char *cp;
-        int i;
 
-        if (file->f_mode & FMODE_READ) {
-                if (!(cp = file->private_data))
-                        return (-EFAULT);       /* should never happen */
-                i = strlen(cp); /* get total string length */
-                if (*off < i) {
-                        /* still bytes to transfer */
-                        cp += *off;     /* point to desired data offset */
-                        i -= *off;      /* remaining length */
-                        if (i > count)
-                                i = count;      /* limit length to transfer */
-                        if (copy_to_user(buf, cp, i))
-                                return (-EFAULT);       /* copy error */
-                        *off += i;      /* adjust offset */
-                } else
-                        return (0);
-        } else
-                return (-EPERM);        /* no permission to read */
-
-        return (i);
+        if (!(file->f_mode & FMODE_READ))
+                return -EPERM;  /* no permission to read */
+
+        if (!(cp = file->private_data))
+                return -EFAULT; /* should never happen */
+
+        return simple_read_from_buffer(buf, count, off, cp, strlen(cp));
 }                               /* hysdn_conf_read */
 
 /******************/