From e30f5979a81adca961add1108a175a0098489ded Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Fri, 14 Oct 2011 19:23:27 -0300 Subject: [PATCH] --- yaml --- r: 277691 b: refs/heads/master c: b7059136d765603f2cff05d5e2d4850a4e505ec8 h: refs/heads/master i: 277689: c7f5f248b6effca3af7a6a39b28ee5dfef237474 277687: 29703267ac9fbf388e33583cb3800071487b9a60 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/mgmt.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d63ac9558e0f..c9c8f4a296d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 56b7d137855eb02cba8aecbb67d49c24b43644b0 +refs/heads/master: b7059136d765603f2cff05d5e2d4850a4e505ec8 diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c index 42e26146a9a6..9d0e22385573 100644 --- a/trunk/net/bluetooth/mgmt.c +++ b/trunk/net/bluetooth/mgmt.c @@ -917,7 +917,7 @@ static int load_keys(struct sock *sk, u16 index, unsigned char *data, u16 len) cp = (void *) data; if (len < sizeof(*cp)) - return -EINVAL; + return cmd_status(sk, index, MGMT_OP_LOAD_KEYS, EINVAL); key_count = get_unaligned_le16(&cp->key_count); @@ -925,7 +925,7 @@ static int load_keys(struct sock *sk, u16 index, unsigned char *data, u16 len) if (expected_len != len) { BT_ERR("load_keys: expected %u bytes, got %u bytes", len, expected_len); - return -EINVAL; + return cmd_status(sk, index, MGMT_OP_LOAD_KEYS, EINVAL); } hdev = hci_dev_get(index);