The patch titled
net/bluetooth/hidp/core.c: Make hidp_setup_input() return int
has been removed from the -mm tree. Its filename was
net-bluetooth-hidp-corec-make-hidp_setup_input.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: net/bluetooth/hidp/core.c: Make hidp_setup_input() return int
From: WANG Cong <xiyou.wangcong@xxxxxxxxx>
- makes hidp_setup_input() return int to indicate errors;
- checks its return value to handle errors.
Thanks to roel and Marcel Holtmann for comments.
Signed-off-by: WANG Cong <xiyou.wangcong@xxxxxxxxx>
Cc: Marcel Holtmann <marcel@xxxxxxxxxxxx>
Cc: roel <12o3l@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
net/bluetooth/hidp/core.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff -puN net/bluetooth/hidp/core.c~net-bluetooth-hidp-corec-make-hidp_setup_input net/bluetooth/hidp/core.c
--- a/net/bluetooth/hidp/core.c~net-bluetooth-hidp-corec-make-hidp_setup_input
+++ a/net/bluetooth/hidp/core.c
@@ -625,7 +625,7 @@ static struct device *hidp_get_device(st
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(stru
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_conn
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);
_
Patches currently in -mm which might be from xiyou.wangcong@xxxxxxxxx are
git-net.patch
drivers-usb-misc-sisusbvga-sisusbc-kill-two-unused-variables.patch
fs-romfs-inodec-trivial-improvements.patch
fs-udf-ballocc-mark-a-variable-as-uninitialized_var.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
