From 99654fcf7dee407ba45ce099c9aba2a248d539ea Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 14 Feb 2013 16:42:13 +0000 Subject: [PATCH] --- yaml --- r: 354501 b: refs/heads/master c: 0cbfc8269b980adafa7b529bb529a2fc316c5405 h: refs/heads/master i: 354499: 00f81e8ddf72ce3facdbc78c714e13cbea2381db v: v3 --- [refs] | 2 +- trunk/drivers/staging/comedi/drivers/vmk80xx.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 718f7cc4efce..cd4d5ba320db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d489082ac690f7cf784e66cfd74f076a361740ba +refs/heads/master: 0cbfc8269b980adafa7b529bb529a2fc316c5405 diff --git a/trunk/drivers/staging/comedi/drivers/vmk80xx.c b/trunk/drivers/staging/comedi/drivers/vmk80xx.c index eed46ee4f710..78228f6a2056 100644 --- a/trunk/drivers/staging/comedi/drivers/vmk80xx.c +++ b/trunk/drivers/staging/comedi/drivers/vmk80xx.c @@ -994,12 +994,12 @@ static int vmk80xx_alloc_usb_buffers(struct comedi_device *dev) size_t size; size = le16_to_cpu(devpriv->ep_rx->wMaxPacketSize); - devpriv->usb_rx_buf = kmalloc(size, GFP_KERNEL); + devpriv->usb_rx_buf = kzalloc(size, GFP_KERNEL); if (!devpriv->usb_rx_buf) return -ENOMEM; size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize); - devpriv->usb_tx_buf = kmalloc(size, GFP_KERNEL); + devpriv->usb_tx_buf = kzalloc(size, GFP_KERNEL); if (!devpriv->usb_tx_buf) { kfree(devpriv->usb_rx_buf); return -ENOMEM;