diff options
| author | Colin Cross <ccross@android.com> | 2013-03-13 17:16:02 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2013-03-13 17:16:02 -0700 |
| commit | 0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f (patch) | |
| tree | 9bab760a750d9cf4504d92603ee7fc82beeb2e38 /net/bluetooth | |
| parent | a276def548828763cf5ac228adf8c1ca73f8d4d3 (diff) | |
| parent | e28c3f2b514b5581e15614f7cf976131092cf4b6 (diff) | |
| download | kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.zip kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.gz kernel_samsung_tuna-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.bz2 | |
Merge tag 'v3.0.68' into android-3.0
This is the 3.0.68 stable release
Conflicts:
kernel/cgroup.c
Change-Id: I067982d25e18e3a12de93a5eb6429b8829d7ca11
Diffstat (limited to 'net/bluetooth')
| -rwxr-xr-x | net/bluetooth/hci_event.c | 2 | ||||
| -rw-r--r-- | net/bluetooth/hidp/core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 5a7074a..0d6f70a 100755 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1977,7 +1977,7 @@ static inline void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *sk if (ev->opcode != HCI_OP_NOP) del_timer(&hdev->cmd_timer); - if (ev->ncmd) { + if (ev->ncmd && !test_bit(HCI_RESET, &hdev->flags)) { atomic_set(&hdev->cmd_cnt, 1); if (!skb_queue_empty(&hdev->cmd_q)) tasklet_schedule(&hdev->cmd_task); diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index fb68f34..06f1197 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c @@ -936,7 +936,7 @@ static int hidp_setup_hid(struct hidp_session *session, hid->version = req->version; hid->country = req->country; - strncpy(hid->name, req->name, 128); + strncpy(hid->name, req->name, sizeof(req->name) - 1); strncpy(hid->phys, batostr(&bt_sk(session->ctrl_sock->sk)->src), 64); strncpy(hid->uniq, batostr(&bt_sk(session->ctrl_sock->sk)->dst), 64); |