Skip to contentSkip to conversation

input: must_check fixes

PATCH New Randy.Dunlap 1 participant 1 message Jul 12, 2006 Input drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 input: must_check fixes

From: Randy Dunlap <[email protected]>

Check all __must_check warnings in gameport and serio.

---
 drivers/input/gameport/gameport.c |   39 ++++++++++++++++++++++++--------
 drivers/input/serio/serio.c       |   46 ++++++++++++++++++++++++++++----------
 2 files changed, 65 insertions(+), 20 deletions(-)
drivers/input/gameport/gameport.c +30 -9
@@ -211,9 +211,13 @@ static void gameport_release_driver(stru
 
 static void gameport_find_driver(struct gameport *gameport)
 {
+	int ret;
+
 	down_write(&gameport_bus.subsys.rwsem);
-	device_attach(&gameport->dev);
+	ret = device_attach(&gameport->dev);
 	up_write(&gameport_bus.subsys.rwsem);
+	if (ret < 0)
+		printk(KERN_WARNING "gameport: device_attach error: %d\n", ret);
 }
 
 
@@ -353,6 +357,7 @@ static void gameport_handle_event(void)
 	 * taking performance hit.
 	 */
 	if ((event = gameport_get_event())) {
+		int ret;
 
 		switch (event->type) {
 			case GAMEPORT_REGISTER_PORT:
@@ -370,7 +375,11 @@ static void gameport_handle_event(void)
 
 			case GAMEPORT_REGISTER_DRIVER:
 				gameport_drv = event->object;
-				driver_register(&gameport_drv->driver);
+				ret = driver_register(&gameport_drv->driver);
+				if (ret < 0)
+					printk(KERN_WARNING "gameport: "
+						"driver_register error: %d\n",
+						ret);
 				break;
 
 			default:
@@ -544,6 +553,8 @@ static void gameport_init_port(struct ga
  */
 static void gameport_add_port(struct gameport *gameport)
 {
+	int ret;
+
 	if (gameport->parent)
 		gameport->parent->child = gameport;
 
@@ -558,8 +569,11 @@ static void gameport_add_port(struct gam
 		printk(KERN_INFO "gameport: %s is %s, speed %dkHz\n",
 			gameport->name, gameport->phys, gameport->speed);
 
-	device_add(&gameport->dev);
-	gameport->registered = 1;
+	ret = device_add(&gameport->dev);
+	if (ret < 0)
+		printk(KERN_WARNING "gameport: device_add error: %d\n", ret);
+	else
+		gameport->registered = 1;
 }
 
 /*
@@ -778,17 +792,24 @@ void gameport_close(struct gameport *gam
 
 static int __init gameport_init(void)
 {
+	int ret;
+
+	gameport_bus.dev_attrs = gameport_device_attrs;
+	gameport_bus.drv_attrs = gameport_driver_attrs;
+	gameport_bus.match = gameport_bus_match;
+	ret = bus_register(&gameport_bus);
+	if (ret < 0) {
+		printk(KERN_WARNING "gameport: bus_register error: %d\n", ret);
+		return ret;
+	}
+
 	gameport_task = kthread_run(gameport_thread, NULL, "kgameportd");
 	if (IS_ERR(gameport_task)) {
 		printk(KERN_ERR "gameport: Failed to start kgameportd\n");
+		bus_unregister(&gameport_bus);
 		return PTR_ERR(gameport_task);
 	}
 
-	gameport_bus.dev_attrs = gameport_device_attrs;
-	gameport_bus.drv_attrs = gameport_driver_attrs;
-	gameport_bus.match = gameport_bus_match;
-	bus_register(&gameport_bus);
-
 	return 0;
 }
 
drivers/input/serio/serio.c +35 -11

90 lines not on this page · raw message

---