1 files changed, 3 insertions, 11 deletions

diff --git a/drivers/usb/host/sl811-hcd.c b/drivers/usb/host/sl811-hcd.c
index 15a93f946afd..e90953a9c9fb 100644
--- a/drivers/usb/host/sl811-hcd.c
+++ b/drivers/usb/host/sl811-hcd.c
@@ -438,7 +438,6 @@ static void finish_request(
         spin_lock(&urb->lock);
         if (urb->status == -EINPROGRESS)
                 urb->status = status;
-        urb->hcpriv = NULL;
         spin_unlock(&urb->lock);
 
         usb_hcd_unlink_urb_from_ep(sl811_to_hcd(sl811), urb);
@@ -545,17 +544,10 @@ done(struct sl811 *sl811, struct sl811h_ep *ep, u8 bank)
                         sl811_read_buf(sl811, SL811HS_PACKET_BUF(bank == 0),
                                         buf, len);
                         usb_dotoggle(udev, ep->epnum, 0);
-                        if (urb->actual_length == urb->transfer_buffer_length)
+                        if (urb->actual_length == urb->transfer_buffer_length
+                                        || len < ep->maxpacket)
                                 urbstat = 0;
-                        else if (len < ep->maxpacket) {
-                                if (urb->transfer_flags & URB_SHORT_NOT_OK)
-                                        urbstat = -EREMOTEIO;
-                                else
-                                        urbstat = 0;
-                        }
-                        if (usb_pipecontrol(urb->pipe)
-                                        && (urbstat == -EREMOTEIO
-                                                || urbstat == 0)) {
+                        if (usb_pipecontrol(urb->pipe) && urbstat == 0) {
 
                                 /* NOTE if the status stage STALLs (why?),
                                  * this reports the wrong urb status.