Commit 48d9cc9d authored by Fabian Henneke's avatar Fabian Henneke Committed by Marcel Holtmann

Bluetooth: hidp: Let hidp_send_message return number of queued bytes

Let hidp_send_message return the number of successfully queued bytes
instead of an unconditional 0.

With the return value fixed to 0, other drivers relying on hidp, such as
hidraw, can not return meaningful values from their respective
implementations of write(). In particular, with the current behavior, a
hidraw device's write() will have different return values depending on
whether the device is connected via USB or Bluetooth, which makes it
harder to abstract away the transport layer.
Signed-off-by: default avatarFabian Henneke <fabian.henneke@gmail.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent a2780889
...@@ -101,6 +101,7 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock, ...@@ -101,6 +101,7 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock,
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
int ret;
BT_DBG("session %p data %p size %d", session, data, size); BT_DBG("session %p data %p size %d", session, data, size);
...@@ -114,13 +115,17 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock, ...@@ -114,13 +115,17 @@ static int hidp_send_message(struct hidp_session *session, struct socket *sock,
} }
skb_put_u8(skb, hdr); skb_put_u8(skb, hdr);
if (data && size > 0) if (data && size > 0) {
skb_put_data(skb, data, size); skb_put_data(skb, data, size);
ret = size;
} else {
ret = 0;
}
skb_queue_tail(transmit, skb); skb_queue_tail(transmit, skb);
wake_up_interruptible(sk_sleep(sk)); wake_up_interruptible(sk_sleep(sk));
return 0; return ret;
} }
static int hidp_send_ctrl_message(struct hidp_session *session, static int hidp_send_ctrl_message(struct hidp_session *session,
......
Markdown is supported
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