svn commit: r249718 - head/sys/powerpc/wii

Rui Paulo rpaulo at FreeBSD.org
Sun Apr 21 08:35:39 UTC 2013


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);
 }


More information about the svn-src-all mailing list