summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authordyoung <dyoung@NetBSD.org>2008-06-10 21:19:01 +0000
committerdyoung <dyoung@NetBSD.org>2008-06-10 21:19:01 +0000
commitfa64da0d81dbc0a15cddeae35d28b4b3650f23c8 (patch)
treef3510ce99a6fb0b35d61d97110a5503701fbcbd4 /sys/dev
parentf5792c6ee8b950ea409b60b35c21f59c7e7b9cf0 (diff)
Fix a couple of mistakes in the device_t/softc split that cause
machines such as my HP Pavilion N3270 to freeze at boot. This should fix PR kern/38815, too.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/esa.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/pci/esa.c b/sys/dev/pci/esa.c
index ea21369c33d..d48980bd49c 100644
--- a/sys/dev/pci/esa.c
+++ b/sys/dev/pci/esa.c
@@ -1,4 +1,4 @@
-/* $NetBSD: esa.c,v 1.49 2008/05/13 19:24:06 jmcneill Exp $ */
+/* $NetBSD: esa.c,v 1.50 2008/06/10 21:19:01 dyoung Exp $ */
/*
* Copyright (c) 2001-2008 Jared D. McNeill <jmcneill@invisible.ca>
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.49 2008/05/13 19:24:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esa.c,v 1.50 2008/06/10 21:19:01 dyoung Exp $");
#include <sys/types.h>
#include <sys/errno.h>
@@ -1051,7 +1051,7 @@ esa_attach(device_t parent, device_t self, void *aux)
return;
}
intrstr = pci_intr_string(pc, ih);
- sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, esa_intr, self);
+ sc->sc_ih = pci_intr_establish(pc, ih, IPL_AUDIO, esa_intr, sc);
if (sc->sc_ih == NULL) {
aprint_error_dev(sc->sc_dev, "can't establish interrupt");
if (intrstr != NULL)
@@ -1104,7 +1104,7 @@ esa_attach(device_t parent, device_t self, void *aux)
/* Attach AC97 host interface */
- sc->host_if.arg = self;
+ sc->host_if.arg = sc;
sc->host_if.attach = esa_attach_codec;
sc->host_if.read = esa_read_codec;
sc->host_if.write = esa_write_codec;