[src/netbsd-6]: src/sys/dev/pci Pull up following revision(s) (requested by h...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/90623b93a62e
branches:  netbsd-6
changeset: 776676:90623b93a62e
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Thu Aug 07 08:13:44 2014 +0000

description:
Pull up following revision(s) (requested by hannken in ticket #1096):
        sys/dev/pci/piixpm.c: revision 1.45
Consistently pass a "struct piixpm_softc" to piixpm_intr.
Prevents a crash on hardware interrupts.

diffstat:

 sys/dev/pci/piixpm.c |  9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r b9dbefca43b9 -r 90623b93a62e sys/dev/pci/piixpm.c
--- a/sys/dev/pci/piixpm.c      Thu Aug 07 08:01:37 2014 +0000
+++ b/sys/dev/pci/piixpm.c      Thu Aug 07 08:13:44 2014 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: piixpm.c,v 1.40.2.1 2013/09/20 03:49:00 riz Exp $ */
+/* $NetBSD: piixpm.c,v 1.40.2.2 2014/08/07 08:13:44 msaitoh Exp $ */
 /*     $OpenBSD: piixpm.c,v 1.20 2006/02/27 08:25:02 grange Exp $      */
 
 /*
@@ -22,7 +22,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.40.2.1 2013/09/20 03:49:00 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: piixpm.c,v 1.40.2.2 2014/08/07 08:13:44 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -500,7 +500,7 @@
                }
                if (st & PIIX_SMB_HS_BUSY)
                        goto timeout;
-               piixpm_intr(smbus);
+               piixpm_intr(sc);
        } else {
                /* Wait for interrupt */
                if (tsleep(sc, PRIBIO, "iicexec", PIIXPM_TIMEOUT * hz))
@@ -535,8 +535,7 @@
 static int
 piixpm_intr(void *arg)
 {
-       struct piixpm_smbus *smbus = arg;
-       struct piixpm_softc *sc = smbus->softc;
+       struct piixpm_softc *sc = arg;
        u_int8_t st;
        u_int8_t *b;
        size_t len;