summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorbouyer <bouyer@NetBSD.org>2008-06-05 18:22:02 +0000
committerbouyer <bouyer@NetBSD.org>2008-06-05 18:22:02 +0000
commit33a062486a8794d76aa91bb62e60aebf536f0fdd (patch)
treef14c2159a3208e5f7b3e21386b86dd53009b300c /sys/dev
parent31197b7671dc2192a9450b97fd327fcaad796a63 (diff)
Call ahci_intr() with the device's softc, not the device_t.
Should fix kern/38742
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/jmide.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/jmide.c b/sys/dev/pci/jmide.c
index cc8ccd1b8ef..55ab0cb4ff6 100644
--- a/sys/dev/pci/jmide.c
+++ b/sys/dev/pci/jmide.c
@@ -1,4 +1,4 @@
-/* $NetBSD: jmide.c,v 1.5 2008/03/21 08:25:38 xtraeme Exp $ */
+/* $NetBSD: jmide.c,v 1.6 2008/06/05 18:22:02 bouyer Exp $ */
/*
* Copyright (c) 2007 Manuel Bouyer.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.5 2008/03/21 08:25:38 xtraeme Exp $");
+__KERNEL_RCSID(0, "$NetBSD: jmide.c,v 1.6 2008/06/05 18:22:02 bouyer Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -104,7 +104,7 @@ typedef enum {
struct jmide_softc {
struct pciide_softc sc_pciide;
- void *sc_ahci;
+ device_t sc_ahci;
int sc_npata;
int sc_nsata;
jmchan_t sc_chan_type[PCIIDE_NUM_CHANNELS];
@@ -300,7 +300,7 @@ jmide_intr(void *arg)
#ifdef NJMAHCI
if (sc->sc_ahci)
- ret |= ahci_intr(sc->sc_ahci);
+ ret |= ahci_intr(device_private(sc->sc_ahci));
#endif
if (sc->sc_npata)
ret |= pciide_pci_intr(&sc->sc_pciide);