Skip to content

Commit

Permalink
HID: fix hidinput_connect ignoring retval from input_register_device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Dirk Hohndel authored and Jiri Kosina committed Oct 31, 2007
1 parent d624284 commit 368d290
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions drivers/hid/hid-input.c
Original file line number Diff line number Diff line change
Expand Up @@ -1152,7 +1152,7 @@ int hidinput_connect(struct hid_device *hid)
kfree(hidinput);
input_free_device(input_dev);
err_hid("Out of memory during hid input probe");
return -1;
goto out_unwind;
}

input_set_drvdata(input_dev, hid);
Expand Down Expand Up @@ -1186,15 +1186,25 @@ int hidinput_connect(struct hid_device *hid)
* UGCI) cram a lot of unrelated inputs into the
* same interface. */
hidinput->report = report;
input_register_device(hidinput->input);
if (input_register_device(hidinput->input))
goto out_cleanup;
hidinput = NULL;
}
}

if (hidinput)
input_register_device(hidinput->input);
if (hidinput && input_register_device(hidinput->input))
goto out_cleanup;

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);

Expand Down

0 comments on commit 368d290

Please sign in to comment.