Skip to contentSkip to conversation

class_simple cleanup in input

PATCH Applied Chris Wright 2 participants 2 messages Mar 4, 2004 – Mar 11, 2004 Input drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 class_simple cleanup in input

Doesn't catch error on class_simple_add, and existing error return paths forget to class_simple_destroy.

===== drivers/input/input.c 1.42 vs edited =====

drivers/input/input.c +4 -0
@@ -727,6 +727,8 @@
 	int retval = -ENOMEM;
 
 	input_class = class_simple_create(THIS_MODULE, "input");
+	if (IS_ERR(input_class))
+		return PTR_ERR(input_class);
 	input_proc_init();
 	retval = register_chrdev(INPUT_MAJOR, "input", &input_fops);
 	if (retval) {
@@ -734,6 +736,7 @@
 		remove_proc_entry("devices", proc_bus_input_dir);
 		remove_proc_entry("handlers", proc_bus_input_dir);
 		remove_proc_entry("input", proc_bus);
+		class_simple_destroy(input_class);
 		return retval;
 	}
 
@@ -743,6 +746,7 @@
 		remove_proc_entry("handlers", proc_bus_input_dir);
 		remove_proc_entry("input", proc_bus);
 		unregister_chrdev(INPUT_MAJOR, "input");
+		class_simple_destroy(input_class);
 	}
 	return retval;
 }
Applied
#1 lore raw
Quoted 2 lines · Chris Wright

Doesn't catch error on class_simple_add, and existing error return paths forget to class_simple_destroy.

Applied, thanks.

greg k-h