summaryrefslogtreecommitdiffstats
path: root/net/bluetooth/cmtp
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2010-12-06 15:35:34 -0500
committerJohn W. Linville <linville@tuxdriver.com>2010-12-06 15:35:34 -0500
commitf435d9eea01309aa7b6c1f134569a7b5957918ae (patch)
tree2737a48d423a8191671098b15aabd6391af2d23a /net/bluetooth/cmtp
parent5ee493767352314893520ac40aec5bb07d0147e0 (diff)
parent09f921f83faa49cdea25abfb98c439c01526b89d (diff)
downloadop-kernel-dev-f435d9eea01309aa7b6c1f134569a7b5957918ae.zip
op-kernel-dev-f435d9eea01309aa7b6c1f134569a7b5957918ae.tar.gz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/bluetooth/cmtp')
-rw-r--r--net/bluetooth/cmtp/core.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index ec0a134..8e5f292 100644
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -78,6 +78,7 @@ static void __cmtp_unlink_session(struct cmtp_session *session)
static void __cmtp_copy_session(struct cmtp_session *session, struct cmtp_conninfo *ci)
{
+ memset(ci, 0, sizeof(*ci));
bacpy(&ci->bdaddr, &session->bdaddr);
ci->flags = session->flags;
OpenPOWER on IntegriCloud