Page MenuHomeFreeBSD
Files F167838671

D59078.diff
No OneTemporary
Actions

D59078.diff
View Options

diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
--- a/sys/dev/sound/pcm/mixer.c
+++ b/sys/dev/sound/pcm/mixer.c
@@ -158,7 +158,7 @@
if (m == NULL || dev >= SOUND_MIXER_NRDEVICES ||
(0 == (m->devs & (1 << dev))))
- return (-1);
+ return (EINVAL);
l = min((lev & 0x00ff), 100);
r = min(((lev & 0xff00) >> 8), 100);
@@ -166,7 +166,7 @@
d = device_get_softc(m->dev);
if (d == NULL)
- return (-1);
+ return (ENXIO);
/* Allow the volume to be "changed" while muted. */
if (muted & (1 << dev)) {
@@ -188,7 +188,7 @@
(void)mixer_set_softpcmvol(m, d, tl, tr);
else if (realdev != SOUND_MIXER_NONE &&
MIXER_SET(m, realdev, tl, tr) < 0)
- return (-1);
+ return (EINVAL);
} else if (child != 0) {
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
if (!(child & (1 << i)) || m->parent[i] != dev)
@@ -205,7 +205,7 @@
realdev = m->realdev[dev];
if (realdev != SOUND_MIXER_NONE &&
MIXER_SET(m, realdev, l, r) < 0)
- return (-1);
+ return (EINVAL);
} else {
if (dev == SOUND_MIXER_PCM && (d->flags & SD_F_SOFTPCMVOL))
(void)mixer_set_softpcmvol(m, d, l, r);
@@ -214,7 +214,7 @@
(void)mixer_set_eq(m, d, dev, (l + r) >> 1);
else if (realdev != SOUND_MIXER_NONE &&
MIXER_SET(m, realdev, l, r) < 0)
- return (-1);
+ return (EINVAL);
}
m->level[dev] = l | (r << 8);
@@ -266,7 +266,7 @@
d = device_get_softc(mixer->dev);
if (d == NULL)
- return -1;
+ return (ENXIO);
src &= mixer->recdevs;
if (src == 0)
src = mixer->recdevs & SOUND_MASK_MIC;
@@ -280,7 +280,7 @@
mixer->recsrc = recsrc;
- return 0;
+ return (0);
}
static int
@@ -785,7 +785,7 @@
ret = mixer_set(m, dev, m->mutedevs, left | (right << 8));
mtx_unlock(m->lock);
- return ((ret != 0) ? ENXIO : 0);
+ return (ret);
}
int
@@ -813,7 +813,7 @@
ret = mixer_setrecsrc(m, src);
mtx_unlock(m->lock);
- return ((ret != 0) ? ENXIO : 0);
+ return (ret);
}
uint32_t
@@ -1001,7 +1001,7 @@
break;
}
mtx_unlock(m->lock);
- return ((ret == 0) ? 0 : ENXIO);
+ return (ret);
}
if ((cmd & ~0xff) == MIXER_READ(0)) {
switch (j) {

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 25, 10:03 PM (2 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37083311
Default Alt Text
D59078.diff (2 KB)

Event Timeline