diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2006-07-06 15:40:09 +0200 |
|---|---|---|
| committer | David S. Miller <davem@sunset.davemloft.net> | 2006-07-12 15:34:28 -0700 |
| commit | 25ea6db04a96d7871e7ece27d566f3228d59d932 (patch) | |
| tree | 12d0b6735a451111c8b45ebb9523caac9578d0fc /net/bluetooth/cmtp | |
| parent | c2ce920468624d87ec5f91f080ea99681dae6d88 (diff) | |
| download | linux-3.10-25ea6db04a96d7871e7ece27d566f3228d59d932.tar.gz linux-3.10-25ea6db04a96d7871e7ece27d566f3228d59d932.tar.bz2 linux-3.10-25ea6db04a96d7871e7ece27d566f3228d59d932.zip | |
[Bluetooth] Remaining transitions to use kzalloc()
This patch makes the remaining transitions to use kzalloc().
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth/cmtp')
| -rw-r--r-- | net/bluetooth/cmtp/capi.c | 4 | ||||
| -rw-r--r-- | net/bluetooth/cmtp/core.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/net/bluetooth/cmtp/capi.c b/net/bluetooth/cmtp/capi.c index 6fb47e00e18..be04e9fb11f 100644 --- a/net/bluetooth/cmtp/capi.c +++ b/net/bluetooth/cmtp/capi.c @@ -75,15 +75,13 @@ static struct cmtp_application *cmtp_application_add(struct cmtp_session *session, __u16 appl) { - struct cmtp_application *app = kmalloc(sizeof(*app), GFP_KERNEL); + struct cmtp_application *app = kzalloc(sizeof(*app), GFP_KERNEL); BT_DBG("session %p application %p appl %d", session, app, appl); if (!app) return NULL; - memset(app, 0, sizeof(*app)); - app->state = BT_OPEN; app->appl = appl; diff --git a/net/bluetooth/cmtp/core.c b/net/bluetooth/cmtp/core.c index 182254a580e..b81a01c64ae 100644 --- a/net/bluetooth/cmtp/core.c +++ b/net/bluetooth/cmtp/core.c @@ -335,10 +335,9 @@ 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 = kmalloc(sizeof(struct cmtp_session), GFP_KERNEL); + session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL); if (!session) return -ENOMEM; - memset(session, 0, sizeof(struct cmtp_session)); down_write(&cmtp_session_sem); |