Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Sep 2012 17:08:14 +0000 (UTC)
From:      Hans Petter Selasky <hselasky@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r240665 - stable/9/sys/dev/usb/serial
Message-ID:  <201209181708.q8IH8E67029888@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: hselasky
Date: Tue Sep 18 17:08:14 2012
New Revision: 240665
URL: http://svn.freebsd.org/changeset/base/240665

Log:
  MFC r240382:
  Restart the USB transfer if the error is not USB_ERR_CANCELLED.

Modified:
  stable/9/sys/dev/usb/serial/ufoma.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/usb/serial/ufoma.c
==============================================================================
--- stable/9/sys/dev/usb/serial/ufoma.c	Tue Sep 18 17:03:32 2012	(r240664)
+++ stable/9/sys/dev/usb/serial/ufoma.c	Tue Sep 18 17:08:14 2012	(r240665)
@@ -631,10 +631,7 @@ tr_setup:
 
 		if (error == USB_ERR_CANCELLED) {
 			return;
-		} else {
-			goto tr_setup;
 		}
-
 		goto tr_transferred;
 	}
 }
@@ -651,7 +648,6 @@ ufoma_ctrl_write_callback(struct usb_xfe
 	case USB_ST_TRANSFERRED:
 tr_transferred:
 	case USB_ST_SETUP:
-tr_setup:
 		pc = usbd_xfer_get_frame(xfer, 1);
 		if (ucom_get_data(&sc->sc_ucom, pc, 0, 1, &actlen)) {
 
@@ -677,10 +673,7 @@ tr_setup:
 
 		if (error == USB_ERR_CANCELLED) {
 			return;
-		} else {
-			goto tr_setup;
 		}
-
 		goto tr_transferred;
 	}
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209181708.q8IH8E67029888>