diff options
| author | Greg Kroah-Hartman | 2012-08-27 16:13:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2012-08-27 16:13:33 +0200 |
| commit | e372dc6c62bf0246a07f3291a26c562cc8659fbd (patch) | |
| tree | c7039c1d1005b80e427761ba768d7697ae4a0b72 /net/bluetooth/rfcomm/tty.c | |
| parent | TTY: check if tty->port is assigned (diff) | |
| parent | Linux 3.6-rc3 (diff) | |
| download | kernel-qcow2-linux-e372dc6c62bf0246a07f3291a26c562cc8659fbd.tar.gz kernel-qcow2-linux-e372dc6c62bf0246a07f3291a26c562cc8659fbd.tar.xz kernel-qcow2-linux-e372dc6c62bf0246a07f3291a26c562cc8659fbd.zip | |
Merge 3.6-rc3 into tty-next
This picks up all of the different fixes in Linus's tree that we also need here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/bluetooth/rfcomm/tty.c')
| -rw-r--r-- | net/bluetooth/rfcomm/tty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c index 18a80b94a8bd..ccc248791d50 100644 --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c @@ -456,7 +456,7 @@ static int rfcomm_get_dev_list(void __user *arg) size = sizeof(*dl) + dev_num * sizeof(*di); - dl = kmalloc(size, GFP_KERNEL); + dl = kzalloc(size, GFP_KERNEL); if (!dl) return -ENOMEM; |