Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Apr 2013 08:35:38 +0000 (UTC)
From:      Rui Paulo <rpaulo@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r249718 - head/sys/powerpc/wii
Message-ID:  <201304210835.r3L8ZchM014046@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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);
 }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304210835.r3L8ZchM014046>