Commit 1ac19f4c authored by Christophe Lucas's avatar Christophe Lucas Committed by Linus Torvalds

[PATCH] hdpu_cpustate.c: misc_register() can fail

Signed-off-by: default avatarChristophe Lucas <clucas@rotomalug.org>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent cf85d5ca
...@@ -192,22 +192,37 @@ static int hdpu_cpustate_probe(struct device *ddev) ...@@ -192,22 +192,37 @@ static int hdpu_cpustate_probe(struct device *ddev)
{ {
struct platform_device *pdev = to_platform_device(ddev); struct platform_device *pdev = to_platform_device(ddev);
struct resource *res; struct resource *res;
struct proc_dir_entry *proc_de;
int ret;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
cpustate.set_addr = (unsigned long *)res->start; cpustate.set_addr = (unsigned long *)res->start;
cpustate.clr_addr = (unsigned long *)res->end - 1; cpustate.clr_addr = (unsigned long *)res->end - 1;
misc_register(&cpustate_dev); ret = misc_register(&cpustate_dev);
create_proc_read_entry("sky_cpustate", 0, 0, cpustate_read_proc, NULL); if (ret) {
printk(KERN_WARNING "sky_cpustate: Unable to register misc "
"device.\n");
cpustate.set_addr = NULL;
cpustate.clr_addr = NULL;
return ret;
}
proc_de = create_proc_read_entry("sky_cpustate", 0, 0,
cpustate_read_proc, NULL);
if (proc_de == NULL)
printk(KERN_WARNING "sky_cpustate: Unable to create proc "
"dir entry\n");
printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n"); printk(KERN_INFO "Sky CPU State Driver v" SKY_CPUSTATE_VERSION "\n");
return 0; return 0;
} }
static int hdpu_cpustate_remove(struct device *ddev) static int hdpu_cpustate_remove(struct device *ddev)
{ {
cpustate.set_addr = 0; cpustate.set_addr = NULL;
cpustate.clr_addr = 0; cpustate.clr_addr = NULL;
remove_proc_entry("sky_cpustate", NULL); remove_proc_entry("sky_cpustate", NULL);
misc_deregister(&cpustate_dev); misc_deregister(&cpustate_dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment