|
@@ -625,7 +625,7 @@ static struct device *hidp_get_device(struct hidp_session *session)
|
|
|
return conn ? &conn->dev : NULL;
|
|
|
}
|
|
|
|
|
|
-static inline void hidp_setup_input(struct hidp_session *session, struct hidp_connadd_req *req)
|
|
|
+static inline int hidp_setup_input(struct hidp_session *session, struct hidp_connadd_req *req)
|
|
|
{
|
|
|
struct input_dev *input = session->input;
|
|
|
int i;
|
|
@@ -667,7 +667,7 @@ static inline void hidp_setup_input(struct hidp_session *session, struct hidp_co
|
|
|
|
|
|
input->event = hidp_input_event;
|
|
|
|
|
|
- input_register_device(input);
|
|
|
+ return input_register_device(input);
|
|
|
}
|
|
|
|
|
|
static int hidp_open(struct hid_device *hid)
|
|
@@ -820,8 +820,11 @@ int hidp_add_connection(struct hidp_connadd_req *req, struct socket *ctrl_sock,
|
|
|
session->flags = req->flags & (1 << HIDP_BLUETOOTH_VENDOR_ID);
|
|
|
session->idle_to = req->idle_to;
|
|
|
|
|
|
- if (session->input)
|
|
|
- hidp_setup_input(session, req);
|
|
|
+ if (session->input) {
|
|
|
+ err = hidp_setup_input(session, req);
|
|
|
+ if (err < 0)
|
|
|
+ goto failed;
|
|
|
+ }
|
|
|
|
|
|
if (session->hid)
|
|
|
hidp_setup_hid(session, req);
|