staging: most: fix error comparison
Subsystems (2)
PATCH 1/3 staging: most: fix error comparison
device_create() returns ERR_PTR on error, it does not return NULL.
--- drivers/staging/most/mostcore/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/most/mostcore/core.c +1 -1
@@ -1936,7 +1936,7 @@ static int __init most_init(void) class_glue_dir =device_create (most_class,NULL ,0 ,NULL ,"mostcore" ); -if (!class_glue_dir) +if (IS_ERR (class_glue_dir)) goto exit_driver; most_aim_kset =
Signature · 1 line
1.9.1
PATCH 2/3 staging: most: return proper error
We were returning ENOMEM on all types of errors. Lets return the actual error code. At the same time remove the label which became unused as a result of this patch.
--- drivers/staging/most/mostcore/core.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
drivers/staging/most/mostcore/core.c +15 -7
@@ -1913,31 +1913,38 @@ EXPORT_SYMBOL_GPL(most_resume_enqueue);static int __init most_init (void ) { +int err; +pr_info ("init()\n" );INIT_LIST_HEAD (&instance_list);INIT_LIST_HEAD (&aim_list);mutex_init (&deregister_mutex);ida_init (&mdev_id); -if (bus_register (&most_bus)) { + err =bus_register (&most_bus); +if (err) {pr_info ("Cannot register most bus\n" ); - goto exit; +return err; } most_class =class_create (THIS_MODULE ,"most" );if (IS_ERR (most_class)) {pr_info ("No udev support.\n" ); + err =PTR_ERR (most_class); goto exit_bus; } -if (driver_register (&mostcore)) { + err =driver_register (&mostcore); +if (err) {pr_info ("Cannot register core driver\n" ); goto exit_class; } class_glue_dir =device_create (most_class,NULL ,0 ,NULL ,"mostcore" ); -if (IS_ERR (class_glue_dir)) +if (IS_ERR (class_glue_dir)) { + err = -ENOMEM ; goto exit_driver; + } most_aim_kset =kset_create_and_add ("aims" ,NULL , &class_glue_dir->kobj);
@@ -1946,8 +1953,10 @@ static int __init most_init(void) most_inst_kset =kset_create_and_add ("devices" ,NULL , &class_glue_dir->kobj); -if (!most_inst_kset) +if (!most_inst_kset) { + err = -ENOMEM ; goto exit_driver_kset; + }return 0 ;
@@ -1961,8 +1970,7 @@ exit_class:class_destroy (most_class); exit_bus:bus_unregister (&most_bus); -exit: -return -ENOMEM ; +return err; } static void __exit most_exit(void)
Signature · 1 line
1.9.1
Greg Kroah-Hartman
maintainerRe: [PATCH 2/3] staging: most: return proper error
Quoted 8 lines · Sudip Mukherjee
We were returning ENOMEM on all types of errors. Lets return the actual error code. At the same time remove the label which became unused as a result of this patch.
Signed-off-by Sudip Mukherjee <[email protected]>--- drivers/staging/most/mostcore/core.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)
This and patch 3/3 don't apply anymore :(
Re: [PATCH 2/3] staging: most: return proper error
Quoted 11 lines · Greg Kroah-Hartman
Quoted 8 lines · Sudip Mukherjee
We were returning ENOMEM on all types of errors. Lets return the actual error code. At the same time remove the label which became unused as a result of this patch.
Signed-off-by Sudip Mukherjee <[email protected]>--- drivers/staging/most/mostcore/core.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-)This and patch 3/3 don't apply anymore :(
This one I have rebased and sent again but looks like 3/3 has already been done by a later patch.
regards
sudip
PATCH 3/3 staging: most: fix id leak
In reply to Sudip MukherjeeIf create_most_inst_obj() fails we returned an error pointer but we missed releasing id.
--- drivers/staging/most/mostcore/core.c | 1 + 1 file changed, 1 insertion(+)
drivers/staging/most/mostcore/core.c +1 -0
@@ -1762,6 +1762,7 @@ struct kobject *most_register_interface(struct most_interface *iface) inst =create_most_inst_obj (name);if (!inst) {pr_info ("Failed to allocate interface instance\n" ); +ida_simple_remove (&mdev_id, id);return ERR_PTR (-ENOMEM ); }
Signature · 1 line
1.9.1