From owner-svn-src-all@FreeBSD.ORG  Sat May 26 08:43:51 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 C9336106566B;
	Sat, 26 May 2012 08:43:51 +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 B48B38FC0C;
	Sat, 26 May 2012 08:43:51 +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 q4Q8hpPh063309;
	Sat, 26 May 2012 08:43:51 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4Q8hppm063307;
	Sat, 26 May 2012 08:43:51 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201205260843.q4Q8hppm063307@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Sat, 26 May 2012 08:43:51 +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: r236073 - head/sys/dev/usb/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, 26 May 2012 08:43:51 -0000

Author: marius
Date: Sat May 26 08:43:51 2012
New Revision: 236073
URL: http://svn.freebsd.org/changeset/base/236073

Log:
  Make the VIA workaround application somewhat more consistent with the
  ATI one.

Modified:
  head/sys/dev/usb/controller/ehci_pci.c

Modified: head/sys/dev/usb/controller/ehci_pci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci_pci.c	Sat May 26 08:41:48 2012	(r236072)
+++ head/sys/dev/usb/controller/ehci_pci.c	Sat May 26 08:43:51 2012	(r236073)
@@ -243,7 +243,8 @@ ehci_pci_via_quirk(device_t self)
 		val = pci_read_config(self, 0x4b, 1);
 		if (val & 0x20)
 			return;
-		pci_write_config(self, 0x4b, val | 0x20, 1);
+		val |= 0x20;
+		pci_write_config(self, 0x4b, val, 1);
 		device_printf(self, "VIA-quirk applied\n");
 	}
 }