From owner-svn-src-all@FreeBSD.ORG  Sat Jan  3 14:33:48 2009
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 8FD81106564A;
	Sat,  3 Jan 2009 14:33:48 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E4218FC08;
	Sat,  3 Jan 2009 14:33:48 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n03EXmbh030236;
	Sat, 3 Jan 2009 14:33:48 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n03EXmYp030235;
	Sat, 3 Jan 2009 14:33:48 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <200901031433.n03EXmYp030235@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 3 Jan 2009 14:33:48 +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: r186722 - head/sys/dev/usb2/controller
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: Sat, 03 Jan 2009 14:33:49 -0000

Author: marius
Date: Sat Jan  3 14:33:48 2009
New Revision: 186722
URL: http://svn.freebsd.org/changeset/base/186722

Log:
  Reapply the intpin correction part of r146420 which somehow
  got lost.

Modified:
  head/sys/dev/usb2/controller/ohci2_pci.c

Modified: head/sys/dev/usb2/controller/ohci2_pci.c
==============================================================================
--- head/sys/dev/usb2/controller/ohci2_pci.c	Sat Jan  3 13:55:02 2009	(r186721)
+++ head/sys/dev/usb2/controller/ohci2_pci.c	Sat Jan  3 14:33:48 2009	(r186722)
@@ -211,6 +211,13 @@ ohci_pci_attach(device_t self)
 
 	pci_enable_busmaster(self);
 
+	/*
+	 * Some Sun PCIO-2 USB controllers have their intpin register
+	 * bogusly set to 0, although it should be 4.  Correct that.
+	 */
+	if (pci_get_devid(self) == 0x1103108e && pci_get_intpin(self) == 0)
+		pci_set_intpin(self, 4);
+
 	rid = PCI_CBMEM;
 	sc->sc_io_res = bus_alloc_resource_any(self, SYS_RES_MEMORY, &rid,
 	    RF_ACTIVE);