CVS commit: [netbsd-6] src/sys/dev/pci

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Thu Aug  7 08:13:44 UTC 2014

Modified Files:
        src/sys/dev/pci [netbsd-6]: piixpm.c

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.40.2.1 -r1.40.2.2 src/sys/dev/pci/piixpm.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/pci/piixpm.c
diff -u src/sys/dev/pci/piixpm.c:1.40.2.1 src/sys/dev/pci/piixpm.c:1.40.2.2
--- src/sys/dev/pci/piixpm.c:1.40.2.1	Fri Sep 20 03:49:00 2013
+++ src/sys/dev/pci/piixpm.c	Thu Aug  7 08:13:44 2014
@@ -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 @@ piixpm_i2c_exec(void *cookie, i2c_op_t o
 		}
 		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 @@ timeout:
 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;