From owner-svn-src-all@FreeBSD.ORG  Sat Jan  7 12:32:50 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 870C5106566B;
	Sat,  7 Jan 2012 12:32:50 +0000 (UTC)
	(envelope-from adrian@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 715018FC08;
	Sat,  7 Jan 2012 12:32:50 +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 q07CWopc039683;
	Sat, 7 Jan 2012 12:32:50 GMT (envelope-from adrian@svn.freebsd.org)
Received: (from adrian@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q07CWoSk039681;
	Sat, 7 Jan 2012 12:32:50 GMT (envelope-from adrian@svn.freebsd.org)
Message-Id: <201201071232.q07CWoSk039681@svn.freebsd.org>
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sat, 7 Jan 2012 12:32:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229772 - stable/9/sys/mips/atheros
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, 07 Jan 2012 12:32:50 -0000

Author: adrian
Date: Sat Jan  7 12:32:50 2012
New Revision: 229772
URL: http://svn.freebsd.org/changeset/base/229772

Log:
  MFC r229765 - Fix the ar724x shift calculation when writing to the PCI config space.

Modified:
  stable/9/sys/mips/atheros/ar724x_pci.c

Modified: stable/9/sys/mips/atheros/ar724x_pci.c
==============================================================================
--- stable/9/sys/mips/atheros/ar724x_pci.c	Sat Jan  7 11:16:23 2012	(r229771)
+++ stable/9/sys/mips/atheros/ar724x_pci.c	Sat Jan  7 12:32:50 2012	(r229772)
@@ -93,7 +93,7 @@ ar724x_pci_write(uint32_t reg, uint32_t 
 	uint32_t val, mask, shift;
 
 	/* Register access is 32-bit aligned */
-	shift = 8 * (offset & (bytes % 4));
+	shift = (offset & 3) * 8;
 	if (bytes % 4)
 		mask = (1 << (bytes * 8)) - 1;
 	else