staging: usbip: changed function return type to void
The function usbip_pad_iso never returns anything but 0 (success). Signed-off-by: Bart Westgeest <bart@elbrys.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
98b9de2189
commit
ac2b41acfa
|
@ -735,26 +735,25 @@ EXPORT_SYMBOL_GPL(usbip_recv_iso);
|
|||
* buffer and iso packets need to be stored and be in propeper endian in urb
|
||||
* before calling this function
|
||||
*/
|
||||
int usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
|
||||
void usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
|
||||
{
|
||||
int np = urb->number_of_packets;
|
||||
int i;
|
||||
int ret;
|
||||
int actualoffset = urb->actual_length;
|
||||
|
||||
if (!usb_pipeisoc(urb->pipe))
|
||||
return 0;
|
||||
return;
|
||||
|
||||
/* if no packets or length of data is 0, then nothing to unpack */
|
||||
if (np == 0 || urb->actual_length == 0)
|
||||
return 0;
|
||||
return;
|
||||
|
||||
/*
|
||||
* if actual_length is transfer_buffer_length then no padding is
|
||||
* present.
|
||||
*/
|
||||
if (urb->actual_length == urb->transfer_buffer_length)
|
||||
return 0;
|
||||
return;
|
||||
|
||||
/*
|
||||
* loop over all packets from last to first (to prevent overwritting
|
||||
|
@ -766,8 +765,6 @@ int usbip_pad_iso(struct usbip_device *ud, struct urb *urb)
|
|||
urb->transfer_buffer + actualoffset,
|
||||
urb->iso_frame_desc[i].actual_length);
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(usbip_pad_iso);
|
||||
|
||||
|
|
|
@ -306,7 +306,7 @@ void usbip_header_correct_endian(struct usbip_header *pdu, int send);
|
|||
void *usbip_alloc_iso_desc_pdu(struct urb *urb, ssize_t *bufflen);
|
||||
/* some members of urb must be substituted before. */
|
||||
int usbip_recv_iso(struct usbip_device *ud, struct urb *urb);
|
||||
int usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
|
||||
void usbip_pad_iso(struct usbip_device *ud, struct urb *urb);
|
||||
int usbip_recv_xbuff(struct usbip_device *ud, struct urb *urb);
|
||||
|
||||
/* usbip_event.c */
|
||||
|
|
|
@ -94,8 +94,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
|
|||
return;
|
||||
|
||||
/* restore the padding in iso packets */
|
||||
if (usbip_pad_iso(ud, urb) < 0)
|
||||
return;
|
||||
usbip_pad_iso(ud, urb);
|
||||
|
||||
if (usbip_dbg_flag_vhci_rx)
|
||||
usbip_dump_urb(urb);
|
||||
|
|
Loading…
Reference in a new issue