The patch titled
input: driver layer error checking
has been added to the -mm tree. Its filename is
input-must_check-fixes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: input: driver layer error checking
From: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Check driver layer return values in gameport and serio.
Signed-off-by: Randy Dunlap <rdunlap@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/input/gameport/gameport.c | 39 ++++++++++++++++++-----
drivers/input/serio/serio.c | 46 +++++++++++++++++++++-------
2 files changed, 65 insertions(+), 20 deletions(-)
diff -puN drivers/input/gameport/gameport.c~input-must_check-fixes drivers/input/gameport/gameport.c
--- a/drivers/input/gameport/gameport.c~input-must_check-fixes
+++ a/drivers/input/gameport/gameport.c
@@ -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;
}
diff -puN drivers/input/serio/serio.c~input-must_check-fixes drivers/input/serio/serio.c
--- a/drivers/input/serio/serio.c~input-must_check-fixes
+++ a/drivers/input/serio/serio.c
@@ -140,9 +140,13 @@ static void serio_release_driver(struct
static void serio_find_driver(struct serio *serio)
{
+ int ret;
+
down_write(&serio_bus.subsys.rwsem);
- device_attach(&serio->dev);
+ ret = device_attach(&serio->dev);
up_write(&serio_bus.subsys.rwsem);
+ if (ret < 0)
+ printk(KERN_WARNING "serio: device_attach error: %d\n", ret);
}
@@ -283,6 +287,7 @@ static void serio_handle_event(void)
* performance hit.
*/
if ((event = serio_get_event())) {
+ int ret;
switch (event->type) {
case SERIO_REGISTER_PORT:
@@ -305,7 +310,11 @@ static void serio_handle_event(void)
case SERIO_REGISTER_DRIVER:
serio_drv = event->object;
- driver_register(&serio_drv->driver);
+ ret = driver_register(&serio_drv->driver);
+ if (ret < 0)
+ printk(KERN_WARNING "serio: "
+ "driver_register error: %d\n",
+ ret);
break;
default:
@@ -542,6 +551,8 @@ static void serio_init_port(struct serio
*/
static void serio_add_port(struct serio *serio)
{
+ int ret;
+
if (serio->parent) {
serio_pause_rx(serio->parent);
serio->parent->child = serio;
@@ -551,9 +562,15 @@ static void serio_add_port(struct serio
list_add_tail(&serio->node, &serio_list);
if (serio->start)
serio->start(serio);
- device_add(&serio->dev);
- sysfs_create_group(&serio->dev.kobj, &serio_id_attr_group);
- serio->registered = 1;
+ ret = device_add(&serio->dev);
+ if (ret < 0)
+ printk(KERN_WARNING "serio: device_add error: %d\n", ret);
+ else
+ serio->registered = 1;
+ ret = sysfs_create_group(&serio->dev.kobj, &serio_id_attr_group);
+ if (ret < 0)
+ printk(KERN_WARNING "serio: sysfs_create_group error: %d\n",
+ ret);
}
/*
@@ -903,18 +920,25 @@ irqreturn_t serio_interrupt(struct serio
static int __init serio_init(void)
{
- serio_task = kthread_run(serio_thread, NULL, "kseriod");
- if (IS_ERR(serio_task)) {
- printk(KERN_ERR "serio: Failed to start kseriod\n");
- return PTR_ERR(serio_task);
- }
+ int ret;
serio_bus.dev_attrs = serio_device_attrs;
serio_bus.drv_attrs = serio_driver_attrs;
serio_bus.match = serio_bus_match;
serio_bus.uevent = serio_uevent;
serio_bus.resume = serio_resume;
- bus_register(&serio_bus);
+ ret = bus_register(&serio_bus);
+ if (ret < 0) {
+ printk(KERN_WARNING "serio: bus_register error: %d\n", ret);
+ return ret;
+ }
+
+ serio_task = kthread_run(serio_thread, NULL, "kseriod");
+ if (IS_ERR(serio_task)) {
+ printk(KERN_ERR "serio: Failed to start kseriod\n");
+ bus_unregister(&serio_bus);
+ return PTR_ERR(serio_task);
+ }
return 0;
}
_
Patches currently in -mm which might be from rdunlap@xxxxxxxxxxxx are
acpi-bus-add-missing-newline.patch
fix-undefined-missing-references-in-isa-miro-sound-driver.patch
sysfs_remove_bin_file-no-return-value-dump_stack-on.patch
pcie-check-and-return-bus_register-errors.patch
pcie-check-and-return-bus_register-errors-fix.patch
pcie-cleanup-on-probe-error.patch
aic7-cleanup-module_parm_desc-strings.patch
dc395x-fix-printk-format-warning.patch
areca-raid-linux-scsi-driver.patch
consistently-use-max_errno-in-__syscall_return.patch
consistently-use-max_errno-in-__syscall_return-fix.patch
eisa-bus-modalias-attributes-support-1.patch
bttv-must_check-fixes.patch
ide-core-must_check-fixes.patch
input-must_check-fixes.patch
kernel-params-must_check-fixes.patch
kobject-must_check-fixes.patch
pcmcia-ds-must_check-fixes.patch
scsi_debug-must_check-fixes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
