isdn divas: fix proc creation

Alexey Dobriyan · davem330 · commit 495b36b15e17 · 2008-06-10T12:49:31.000-07:00
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 &lt;adobriyan@gmail.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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
@@ -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);
 

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,8 @@ static const struct file_operations divas_fops = {`
`125`	`125`
`126`	`126`	`int create_divas_proc(void)`
`127`	`127`	`{`
`128`		`- proc_create(divas_proc_name, S_IFREG \| S_IRUGO, proc_net_eicon,`
`129`		`- &divas_fops);`
	`128`	`+ divas_proc_entry = proc_create(divas_proc_name, S_IFREG \| S_IRUGO,`
	`129`	`+ proc_net_eicon, &divas_fops);`
`130`	`130`	`if (!divas_proc_entry)`
`131`	`131`	`return (0);`
`132`	`132`