From owner-svn-src-head@FreeBSD.ORG  Sun Apr 21 08:35:39 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0047131F;
 Sun, 21 Apr 2013 08:35:38 +0000 (UTC)
 (envelope-from rpaulo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id E6099B54;
 Sun, 21 Apr 2013 08:35:38 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3L8ZcGD014047;
 Sun, 21 Apr 2013 08:35:38 GMT (envelope-from rpaulo@svn.freebsd.org)
Received: (from rpaulo@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3L8ZchM014046;
 Sun, 21 Apr 2013 08:35:38 GMT (envelope-from rpaulo@svn.freebsd.org)
Message-Id: <201304210835.r3L8ZchM014046@svn.freebsd.org>
From: Rui Paulo <rpaulo@FreeBSD.org>
Date: Sun, 21 Apr 2013 08:35:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r249718 - head/sys/powerpc/wii
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 21 Apr 2013 08:35:39 -0000

Author: rpaulo
Date: Sun Apr 21 08:35:38 2013
New Revision: 249718
URL: http://svnweb.freebsd.org/changeset/base/249718

Log:
  Fix an off by one calculation in wiipic_dispatch().

Modified:
  head/sys/powerpc/wii/wii_pic.c

Modified: head/sys/powerpc/wii/wii_pic.c
==============================================================================
--- head/sys/powerpc/wii/wii_pic.c	Sun Apr 21 07:48:38 2013	(r249717)
+++ head/sys/powerpc/wii/wii_pic.c	Sun Apr 21 08:35:38 2013	(r249718)
@@ -156,7 +156,10 @@ wiipic_dispatch(device_t dev, struct tra
 	uint32_t irq;
 
 	sc = device_get_softc(dev);
-	irq = ffs(wiipic_icr_read(sc) & wiipic_imr_read(sc));
+	irq = wiipic_icr_read(sc) & wiipic_imr_read(sc);
+	if (irq == 0)
+		return;
+	irq = ffs(irq) - 1;
 	KASSERT(irq < WIIPIC_NIRQ, ("bogus irq %d", irq));
 	powerpc_dispatch_intr(sc->sc_vector[irq], tf);
 }