Merge branch 'master' into endpoint_tests

usb/transfer_test.go

@@ -159,10 +159,10 @@ func TestTransferProtocol(t *testing.T) {
 		t.Errorf("xfer#1(resubmitted).wait returned %d bytes, want %d", got, want)
 	}
 
-	for i := 0; i < 2; i++ {
+	for _, x := range xfers {
-		xfers[i].cancel()
+		x.cancel()
-		xfers[i].wait()
+		x.wait()
-		xfers[i].free()
+		x.free()
 	}
 }