hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: comedi: usbdux: tidy up usbdux_alloc_usb_buffers() 

Tidy up the error path by doing all the basic allocations then checking
for failures.

We have the comedi device now so fill in the urb->context.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-07-29 17:46:27 -07:00 committed by Greg Kroah-Hartman
parent aa25b91304
commit ef1e3c4a3b
1 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/staging/comedi/drivers/usbdux.c
View File

@ -1566,25 +1566,15 @@ static int usbdux_alloc_usb_buffers(struct comedi_device *dev)
struct urb *urb; struct urb *urb;
int i; int i;
/* create space for the commands going to the usb device */
devpriv->dux_commands = kzalloc(SIZEOFDUXBUFFER, GFP_KERNEL); devpriv->dux_commands = kzalloc(SIZEOFDUXBUFFER, GFP_KERNEL);
if (!devpriv->dux_commands)
return -ENOMEM;
/* create space for the in buffer and set it to zero */
devpriv->in_buf = kzalloc(SIZEINBUF, GFP_KERNEL); devpriv->in_buf = kzalloc(SIZEINBUF, GFP_KERNEL);
if (!devpriv->in_buf)
return -ENOMEM;
/* create space of the instruction buffer */
devpriv->insn_buf = kzalloc(SIZEINSNBUF, GFP_KERNEL); devpriv->insn_buf = kzalloc(SIZEINSNBUF, GFP_KERNEL);
if (!devpriv->insn_buf)
return -ENOMEM;
/* in urbs */
devpriv->ai_urbs = kcalloc(devpriv->n_ai_urbs, sizeof(*urb), devpriv->ai_urbs = kcalloc(devpriv->n_ai_urbs, sizeof(*urb),
GFP_KERNEL); GFP_KERNEL);
if (!devpriv->ai_urbs) devpriv->ao_urbs = kcalloc(devpriv->n_ao_urbs, sizeof(*urb),
GFP_KERNEL);
if (!devpriv->dux_commands || !devpriv->in_buf || !devpriv->insn_buf ||
!devpriv->ai_urbs || !devpriv->ao_urbs)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < devpriv->n_ai_urbs; i++) { for (i = 0; i < devpriv->n_ai_urbs; i++) {
@ -1595,9 +1585,7 @@ static int usbdux_alloc_usb_buffers(struct comedi_device *dev)
devpriv->ai_urbs[i] = urb; devpriv->ai_urbs[i] = urb;
urb->dev = usb; urb->dev = usb;
/* will be filled later with a pointer to the comedi-device */ urb->context = dev;
/* and ONLY then the urb should be submitted */
urb->context = NULL;
urb->pipe = usb_rcvisocpipe(usb, 6); urb->pipe = usb_rcvisocpipe(usb, 6);
urb->transfer_flags = URB_ISO_ASAP; urb->transfer_flags = URB_ISO_ASAP;
urb->transfer_buffer = kzalloc(SIZEINBUF, GFP_KERNEL); urb->transfer_buffer = kzalloc(SIZEINBUF, GFP_KERNEL);
@ -1611,12 +1599,6 @@ static int usbdux_alloc_usb_buffers(struct comedi_device *dev)
urb->iso_frame_desc[0].length = SIZEINBUF; urb->iso_frame_desc[0].length = SIZEINBUF;
} }
/* out urbs */
devpriv->ao_urbs = kcalloc(devpriv->n_ao_urbs, sizeof(*urb),
GFP_KERNEL);
if (!devpriv->ao_urbs)
return -ENOMEM;
for (i = 0; i < devpriv->n_ao_urbs; i++) { for (i = 0; i < devpriv->n_ao_urbs; i++) {
/* one frame: 1ms */ /* one frame: 1ms */
urb = usb_alloc_urb(1, GFP_KERNEL); urb = usb_alloc_urb(1, GFP_KERNEL);
@ -1625,9 +1607,7 @@ static int usbdux_alloc_usb_buffers(struct comedi_device *dev)
devpriv->ao_urbs[i] = urb; devpriv->ao_urbs[i] = urb;
urb->dev = usb; urb->dev = usb;
/* will be filled later with a pointer to the comedi-device */ urb->context = dev;
/* and ONLY then the urb should be submitted */
urb->context = NULL;
urb->pipe = usb_sndisocpipe(usb, 2); urb->pipe = usb_sndisocpipe(usb, 2);
urb->transfer_flags = URB_ISO_ASAP; urb->transfer_flags = URB_ISO_ASAP;
urb->transfer_buffer = kzalloc(SIZEOUTBUF, GFP_KERNEL); urb->transfer_buffer = kzalloc(SIZEOUTBUF, GFP_KERNEL);