Merge branch 'linus' into core/rcu

2 files changed, 2 insertions, 3 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);