From owner-svn-src-all@FreeBSD.ORG  Tue Jan  3 19:10:37 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 96096106566C;
	Tue,  3 Jan 2012 19:10:37 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8555F8FC0A;
	Tue,  3 Jan 2012 19:10:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q03JAbKQ037982;
	Tue, 3 Jan 2012 19:10:37 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q03JAbY6037980;
	Tue, 3 Jan 2012 19:10:37 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201201031910.q03JAbY6037980@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Tue, 3 Jan 2012 19:10:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229408 - head/sys/mips/cavium/usb
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Jan 2012 19:10:37 -0000

Author: gonzo
Date: Tue Jan  3 19:10:37 2012
New Revision: 229408
URL: http://svn.freebsd.org/changeset/base/229408

Log:
  - Octeon-SDK strictly requires multi_count to be zero for
      full and low speed devices.

Modified:
  head/sys/mips/cavium/usb/octusb.c

Modified: head/sys/mips/cavium/usb/octusb.c
==============================================================================
--- head/sys/mips/cavium/usb/octusb.c	Tue Jan  3 19:09:01 2012	(r229407)
+++ head/sys/mips/cavium/usb/octusb.c	Tue Jan  3 19:10:37 2012	(r229408)
@@ -169,7 +169,7 @@ octusb_host_alloc_endpoint(struct octusb
 	    (td->qh->ep_num & UE_DIR_IN) ? CVMX_USB_DIRECTION_IN :
 	    CVMX_USB_DIRECTION_OUT,
 	    td->qh->ep_interval,
-	    td->qh->ep_mult,
+	    (td->qh->dev_speed == USB_SPEED_HIGH) ? td->qh->ep_mult : 0,
 	    td->qh->hs_hub_addr,
 	    td->qh->hs_hub_port);