From d64aaa078d30a423e31468441b1bae28dbe3b6f1 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sat, 30 Oct 2010 18:26:31 +0400 Subject: [PATCH] --- yaml --- r: 224920 b: refs/heads/master c: d31dbf6e5989b2fd9a30ec5b25436e94f009d6df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hidp/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 80e67fec2efd..125a800f0966 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3185fbd9d7bb166992f072440b3329f58bf2c60a +refs/heads/master: d31dbf6e5989b2fd9a30ec5b25436e94f009d6df diff --git a/trunk/net/bluetooth/hidp/core.c b/trunk/net/bluetooth/hidp/core.c index c0ee8b3928ed..29544c21f4b5 100644 --- a/trunk/net/bluetooth/hidp/core.c +++ b/trunk/net/bluetooth/hidp/core.c @@ -107,6 +107,7 @@ static void __hidp_unlink_session(struct hidp_session *session) static void __hidp_copy_session(struct hidp_session *session, struct hidp_conninfo *ci) { + memset(ci, 0, sizeof(*ci)); bacpy(&ci->bdaddr, &session->bdaddr); ci->flags = session->flags; @@ -115,7 +116,6 @@ static void __hidp_copy_session(struct hidp_session *session, struct hidp_connin ci->vendor = 0x0000; ci->product = 0x0000; ci->version = 0x0000; - memset(ci->name, 0, 128); if (session->input) { ci->vendor = session->input->id.vendor;