diff options
| author | scottl <scottl@FreeBSD.org> | 2002-01-27 23:09:41 +0000 |
|---|---|---|
| committer | scottl <scottl@FreeBSD.org> | 2002-01-27 23:09:41 +0000 |
| commit | 336ec4d2e719dcefc0edc5fe2231cc00d761f9d4 (patch) | |
| tree | 34767afb6b76f967ed90f2fe9833082625a80d93 /sys/dev/sound | |
| parent | c3958d9a9e6e0828fe35196bd3d449ac82f7d4a9 (diff) | |
| download | FreeBSD-src-336ec4d2e719dcefc0edc5fe2231cc00d761f9d4.zip FreeBSD-src-336ec4d2e719dcefc0edc5fe2231cc00d761f9d4.tar.gz | |
Recent changes to newpcm require that the CHANNEL_SETFORMAT op return 0
for success, non-zero otherwise. The maestro and maestro3 drivers were
returning the format code, which was being interpreted as a failure code.
Fixed. No one seems to have noticed that the maestro driver was broken,
but I'll fix it anyways.
MFC after: 2 weeks
Diffstat (limited to 'sys/dev/sound')
| -rw-r--r-- | sys/dev/sound/pci/maestro.c | 2 | ||||
| -rw-r--r-- | sys/dev/sound/pci/maestro3.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/sound/pci/maestro.c b/sys/dev/sound/pci/maestro.c index 5483853..bf5f442 100644 --- a/sys/dev/sound/pci/maestro.c +++ b/sys/dev/sound/pci/maestro.c @@ -717,7 +717,7 @@ aggch_setplayformat(kobj_t obj, void *data, u_int32_t format) } ch->wcreg_tpl = wcreg_tpl; ch->aputype = aputype; - return format; + return 0; } static int diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index 812fd91..49486cb 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -495,7 +495,7 @@ m3_pchan_setformat(kobj_t kobj, void *chdata, u_int32_t format) m3_wr_assp_data(sc, ch->dac_data + SRC3_WORD_LENGTH_OFFSET, data); ch->fmt = format; - return format; + return 0; } static int @@ -770,7 +770,7 @@ m3_rchan_setformat(kobj_t kobj, void *chdata, u_int32_t format) m3_wr_assp_data(sc, ch->adc_data + SRC3_WORD_LENGTH_OFFSET, data); ch->fmt = format; - return format; + return 0; } static int |
