Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 354501
b: refs/heads/master
c: 0cbfc82
h: refs/heads/master
i:
  354499: 00f81e8
v: v3
  • Loading branch information
Ian Abbott authored and Greg Kroah-Hartman committed Feb 15, 2013
1 parent 8751124 commit 99654fc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: d489082ac690f7cf784e66cfd74f076a361740ba
refs/heads/master: 0cbfc8269b980adafa7b529bb529a2fc316c5405
4 changes: 2 additions & 2 deletions trunk/drivers/staging/comedi/drivers/vmk80xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 99654fc

Please sign in to comment.