Merge tag 'pinctrl-for-v3.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / staging / dwc2 / hcd.c

diff --git a/drivers/staging/dwc2/hcd.c b/drivers/staging/dwc2/hcd.c
index 83629d84155d569be1c7ed86fb239459e176a90d..3cfd2d5152c92b001ce3fba0752665612a04d2c7 100644 (file)
--- a/drivers/staging/dwc2/hcd.c
+++ b/drivers/staging/dwc2/hcd.c
@@ -784,8 +784,8 @@ static int dwc2_assign_and_init_hc(struct dwc2_hsotg *hsotg, struct dwc2_qh *qh)
        chan->data_pid_start = qh->data_toggle;
        chan->multi_count = 1;
 
-       if ((urb->actual_length < 0 || urb->actual_length > urb->length) &&
-           !dwc2_hcd_is_pipe_in(&urb->pipe_info))
+       if (urb->actual_length > urb->length &&
+               !dwc2_hcd_is_pipe_in(&urb->pipe_info))
                urb->actual_length = urb->length;
 
        if (hsotg->core_params->dma_enable > 0) {