linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / net / bluetooth / cmtp / core.c

diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c
index b81a01c..901eff7 100644 (file)
--- a/net/bluetooth/cmtp/core.c
+++ b/net/bluetooth/cmtp/core.c
@@ -20,6 +20,7 @@
    SOFTWARE IS DISCLAIMED.
 */
 
+#include <linux/config.h>
 #include <linux/module.h>
 
 #include <linux/types.h>
@@ -335,9 +336,10 @@ int cmtp_add_connection(struct cmtp_connadd_req *req, struct socket *sock)
        baswap(&src, &bt_sk(sock->sk)->src);
        baswap(&dst, &bt_sk(sock->sk)->dst);
 
-       session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL);
+       session = kmalloc(sizeof(struct cmtp_session), GFP_KERNEL);
        if (!session) 
                return -ENOMEM;
+       memset(session, 0, sizeof(struct cmtp_session));
 
        down_write(&cmtp_session_sem);