Merge branch 'master'

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
index 52cbd45c308f..85738223ff0c 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
@@ -261,12 +261,10 @@ static int vhci_open(struct inode *inode, struct file *file)
         struct vhci_data *vhci;
         struct hci_dev *hdev;
 
-        vhci = kmalloc(sizeof(struct vhci_data), GFP_KERNEL);
+        vhci = kzalloc(sizeof(struct vhci_data), GFP_KERNEL);
         if (!vhci)
                 return -ENOMEM;
 
-        memset(vhci, 0, sizeof(struct vhci_data));
-
         skb_queue_head_init(&vhci->readq);
         init_waitqueue_head(&vhci->read_wait);