1 files changed, 9 insertions, 11 deletions

diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index 69b7f8e77596..689cd27ac890 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1025,6 +1025,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
 {
         struct urb *urb = &sc->work_urb;
         struct bulk_cs_wrap *bcs;
+        int endp;
         int len;
         int rc;
 
@@ -1033,6 +1034,10 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                 return;
         }
 
+        endp = usb_pipeendpoint(sc->last_pipe);
+        if (usb_pipein(sc->last_pipe))
+                endp |= USB_DIR_IN;
+
         if (cmd->state == UB_CMDST_CLEAR) {
                 if (urb->status == -EPIPE) {
                         /*
@@ -1048,9 +1053,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                  * We ignore the result for the halt clear.
                  */
 
-                /* reset the endpoint toggle */
-                usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),
-                        usb_pipeout(sc->last_pipe), 0);
+                usb_reset_endpoint(sc->dev, endp);
 
                 ub_state_sense(sc, cmd);
 
@@ -1065,9 +1068,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                  * We ignore the result for the halt clear.
                  */
 
-                /* reset the endpoint toggle */
-                usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),
-                        usb_pipeout(sc->last_pipe), 0);
+                usb_reset_endpoint(sc->dev, endp);
 
                 ub_state_stat(sc, cmd);
 
@@ -1082,9 +1083,7 @@ static void ub_scsi_urb_compl(struct ub_dev *sc, struct ub_scsi_cmd *cmd)
                  * We ignore the result for the halt clear.
                  */
 
-                /* reset the endpoint toggle */
-                usb_settoggle(sc->dev, usb_pipeendpoint(sc->last_pipe),
-                        usb_pipeout(sc->last_pipe), 0);
+                usb_reset_endpoint(sc->dev, endp);
 
                 ub_state_stat_counted(sc, cmd);
 
@@ -2119,8 +2118,7 @@ static int ub_probe_clear_stall(struct ub_dev *sc, int stalled_pipe)
         del_timer_sync(&timer);
         usb_kill_urb(&sc->work_urb);
 
-        /* reset the endpoint toggle */
-        usb_settoggle(sc->dev, endp, usb_pipeout(sc->last_pipe), 0);
+        usb_reset_endpoint(sc->dev, endp);
 
         return 0;
 }