Эх сурвалжийг харах

isdn divas: fix proc creation

1. creating proc entry and not saving pointer to PDE and checking it
   is not going to work.
2. if proc entry wasn't created, no reason to remove it on error path.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Alexey Dobriyan 17 жил өмнө
parent
commit
495b36b15e

+ 0 - 1
drivers/isdn/hardware/eicon/divasmain.c

@@ -806,7 +806,6 @@ static int DIVA_INIT_FUNCTION divas_init(void)
 
 
 	if (!create_divas_proc()) {
 	if (!create_divas_proc()) {
 #ifdef MODULE
 #ifdef MODULE
-		remove_divas_proc();
 		divas_unregister_chrdev();
 		divas_unregister_chrdev();
 		divasfunc_exit();
 		divasfunc_exit();
 #endif
 #endif

+ 2 - 2
drivers/isdn/hardware/eicon/divasproc.c

@@ -125,8 +125,8 @@ static const struct file_operations divas_fops = {
 
 
 int create_divas_proc(void)
 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)
 	if (!divas_proc_entry)
 		return (0);
 		return (0);