Commit 53465eb4 authored by WANG Cong's avatar WANG Cong Committed by David S. Miller
Browse files

[BLUETOOTH]: Make hidp_setup_input() return int



This patch:
- makes hidp_setup_input() return int to indicate errors;
- checks its return value to handle errors.

And this time it is against -rc7-mm1 tree.

Thanks to roel and Marcel Holtmann for comments.
Signed-off-by: default avatarWANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 912d8f0b
...@@ -625,7 +625,7 @@ static struct device *hidp_get_device(struct hidp_session *session) ...@@ -625,7 +625,7 @@ static struct device *hidp_get_device(struct hidp_session *session)
return conn ? &conn->dev : NULL; 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; struct input_dev *input = session->input;
int i; int i;
...@@ -667,7 +667,7 @@ static inline void hidp_setup_input(struct hidp_session *session, struct hidp_co ...@@ -667,7 +667,7 @@ static inline void hidp_setup_input(struct hidp_session *session, struct hidp_co
input->event = hidp_input_event; input->event = hidp_input_event;
input_register_device(input); return input_register_device(input);
} }
static int hidp_open(struct hid_device *hid) 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, ...@@ -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->flags = req->flags & (1 << HIDP_BLUETOOTH_VENDOR_ID);
session->idle_to = req->idle_to; session->idle_to = req->idle_to;
if (session->input) if (session->input) {
hidp_setup_input(session, req); err = hidp_setup_input(session, req);
if (err < 0)
goto failed;
}
if (session->hid) if (session->hid)
hidp_setup_hid(session, req); hidp_setup_hid(session, req);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment