Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 12 Sep 2012 07:59:28 +0000 (UTC)
From:      Kevin Lo <kevlo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r240382 - head/sys/dev/usb/serial
Message-ID:  <201209120759.q8C7xS5B023827@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kevlo
Date: Wed Sep 12 07:59:28 2012
New Revision: 240382
URL: http://svn.freebsd.org/changeset/base/240382

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

Modified:
  head/sys/dev/usb/serial/ufoma.c

Modified: head/sys/dev/usb/serial/ufoma.c
==============================================================================
--- head/sys/dev/usb/serial/ufoma.c	Wed Sep 12 07:34:09 2012	(r240381)
+++ head/sys/dev/usb/serial/ufoma.c	Wed Sep 12 07:59:28 2012	(r240382)
@@ -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?201209120759.q8C7xS5B023827>