leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: vmk80xx: factor out usb buffer allocation

Browse Source 
Factor the code that allocates the usb buffers out of vmk80xx_usb_probe().

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-02-05 17:21:40 -07:00 committed by Greg Kroah-Hartman
parent 49253d542c
commit 78f8fa7f00
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/staging/comedi/drivers/vmk80xx.c
View File

@ -1172,6 +1172,25 @@ static int vmk80xx_find_usb_endpoints(struct vmk80xx_private *devpriv,
return 0;
}
static int vmk80xx_alloc_usb_buffers(struct vmk80xx_private *devpriv)
{
size_t size;
size = le16_to_cpu(devpriv->ep_rx->wMaxPacketSize);
devpriv->usb_rx_buf = kmalloc(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);
if (!devpriv->usb_tx_buf) {
kfree(devpriv->usb_rx_buf);
return -ENOMEM;
}
return 0;
}
static int vmk80xx_attach_common(struct comedi_device *dev,
struct vmk80xx_private *devpriv)
{
@ -1333,7 +1352,6 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
{
const struct vmk80xx_board *boardinfo;
struct vmk80xx_private *devpriv;
size_t size;
int ret;
int i;
@ -1359,19 +1377,10 @@ static int vmk80xx_usb_probe(struct usb_interface *intf,
return ret;
}
size = le16_to_cpu(devpriv->ep_rx->wMaxPacketSize);
devpriv->usb_rx_buf = kmalloc(size, GFP_KERNEL);
if (!devpriv->usb_rx_buf) {
ret = vmk80xx_alloc_usb_buffers(devpriv);
if (ret) {
mutex_unlock(&glb_mutex);
return -ENOMEM;
}
size = le16_to_cpu(devpriv->ep_tx->wMaxPacketSize);
devpriv->usb_tx_buf = kmalloc(size, GFP_KERNEL);
if (!devpriv->usb_tx_buf) {
kfree(devpriv->usb_rx_buf);
mutex_unlock(&glb_mutex);
return -ENOMEM;
return ret;
}
devpriv->usb = interface_to_usbdev(intf);