summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authoraugustss <augustss@NetBSD.org>2001-10-03 20:48:41 +0000
committeraugustss <augustss@NetBSD.org>2001-10-03 20:48:41 +0000
commit3d2be4cf9bb339a7a9dadd7dc0f02f1969d04bcd (patch)
tree393cc4739ffa4f13dbe4297a6a6a6c2ef4a0faf3 /sys/dev
parent4aaca49ce630d3a285aab091f579968520f7936e (diff)
Fix pasto in type of dev_ioctl method.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/audio.c11
-rw-r--r--sys/dev/audio_if.h5
2 files changed, 7 insertions, 9 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 8842e01c90a..ecfaf879449 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.141 2001/10/03 00:04:49 augustss Exp $ */
+/* $NetBSD: audio.c,v 1.142 2001/10/03 20:48:41 augustss Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -1671,7 +1671,7 @@ audio_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
default:
if (hw->dev_ioctl) {
- error = hw->dev_ioctl(sc, cmd, addr, flag, p);
+ error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
} else {
DPRINTF(("audio_ioctl: unknown ioctl\n"));
error = EINVAL;
@@ -2891,11 +2891,10 @@ mixer_ioctl(struct audio_softc *sc, u_long cmd, caddr_t addr, int flag,
break;
default:
- if (hw->dev_ioctl) {
- error = hw->dev_ioctl(sc, cmd, addr, flag, p);
- } else {
+ if (hw->dev_ioctl)
+ error = hw->dev_ioctl(sc->hw_hdl, cmd, addr, flag, p);
+ else
error = EINVAL;
- }
break;
}
DPRINTF(("mixer_ioctl(%lu,'%c',%lu) result %d\n",
diff --git a/sys/dev/audio_if.h b/sys/dev/audio_if.h
index 450b9e8643e..51cde42fb6a 100644
--- a/sys/dev/audio_if.h
+++ b/sys/dev/audio_if.h
@@ -1,4 +1,4 @@
-/* $NetBSD: audio_if.h,v 1.37 2001/10/03 00:04:49 augustss Exp $ */
+/* $NetBSD: audio_if.h,v 1.38 2001/10/03 20:48:41 augustss Exp $ */
/*
* Copyright (c) 1994 Havard Eidnes.
@@ -122,8 +122,7 @@ struct audio_hw_if {
void (*)(void *), void *, struct audio_params *);
int (*trigger_input)(void *, void *, void *, int,
void (*)(void *), void *, struct audio_params *);
- int (*dev_ioctl)(struct audio_softc *sc, u_long cmd, caddr_t addr,
- int flag, struct proc *p);
+ int (*dev_ioctl)(void *, u_long, caddr_t, int, struct proc *);
};
struct audio_attach_args {