UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

HID: fix hidinput_connect ignoring retval from input_register_device 

hidinput_connect() ignores retval from input_register_device(). Fix it
by properly undoing all the registrations that have been already done,
and return error.

Signed-off-by: Dirk Hohndel <hohndel@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
This commit is contained in:
Dirk Hohndel 2007-10-30 13:02:44 +01:00 committed by Jiri Kosina
parent d624284b06
commit 368d290ba2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/hid/hid-input.c
View File

@ -1152,7 +1152,7 @@ int hidinput_connect(struct hid_device *hid)
kfree(hidinput); kfree(hidinput);
input_free_device(input_dev); input_free_device(input_dev);
err_hid("Out of memory during hid input probe"); err_hid("Out of memory during hid input probe");
return -1; goto out_unwind;
} }
input_set_drvdata(input_dev, hid); input_set_drvdata(input_dev, hid);
@ -1186,15 +1186,25 @@ int hidinput_connect(struct hid_device *hid)
* UGCI) cram a lot of unrelated inputs into the * UGCI) cram a lot of unrelated inputs into the
* same interface. */ * same interface. */
hidinput->report = report; hidinput->report = report;
input_register_device(hidinput->input); if (input_register_device(hidinput->input))
goto out_cleanup;
hidinput = NULL; hidinput = NULL;
} }
} }
if (hidinput) if (hidinput && input_register_device(hidinput->input))
input_register_device(hidinput->input); goto out_cleanup;
return 0; return 0;
out_cleanup:
input_free_device(hidinput->input);
kfree(hidinput);
out_unwind:
/* unwind the ones we already registered */
hidinput_disconnect(hid);
return -1;
} }
EXPORT_SYMBOL_GPL(hidinput_connect); EXPORT_SYMBOL_GPL(hidinput_connect);