p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

char: misc: fix error path 

Lets call remove_proc_entry() in the error path only if we have
successfully created "misc" in procfs.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudip Mukherjee 2015-07-13 17:32:28 +05:30 committed by Greg Kroah-Hartman
parent 344e62b36d
commit 1037b2787b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/char/misc.c
View File

@ -281,8 +281,9 @@ static char *misc_devnode(struct device *dev, umode_t *mode)
static int __init misc_init(void) static int __init misc_init(void)
{ {
int err; int err;
struct proc_dir_entry *ret;
proc_create("misc", 0, NULL, &misc_proc_fops); ret = proc_create("misc", 0, NULL, &misc_proc_fops);
misc_class = class_create(THIS_MODULE, "misc"); misc_class = class_create(THIS_MODULE, "misc");
err = PTR_ERR(misc_class); err = PTR_ERR(misc_class);
if (IS_ERR(misc_class)) if (IS_ERR(misc_class))
@ -298,7 +299,8 @@ static int __init misc_init(void)
printk("unable to get major %d for misc devices\n", MISC_MAJOR); printk("unable to get major %d for misc devices\n", MISC_MAJOR);
class_destroy(misc_class); class_destroy(misc_class);
fail_remove: fail_remove:
remove_proc_entry("misc", NULL); if (ret)
remove_proc_entry("misc", NULL);
return err; return err;
} }
subsys_initcall(misc_init); subsys_initcall(misc_init);