Page MenuHomeFreeBSD
Files F157893459

D56264.id174942.diff
No OneTemporary
Actions

D56264.id174942.diff
View Options

diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -1059,7 +1059,7 @@
int
chn_reset(struct pcm_channel *c, uint32_t fmt, uint32_t spd)
{
- int r;
+ int err;
CHN_LOCKASSERT(c);
c->feedcount = 0;
@@ -1071,23 +1071,26 @@
c->flags |= (pcm_getflags(c->dev) & SD_F_BITPERFECT) ?
CHN_F_BITPERFECT : 0;
- r = CHANNEL_RESET(c->methods, c->devinfo);
- if (r == 0 && fmt != 0 && spd != 0) {
- r = chn_setparam(c, fmt, spd);
+ if ((err = CHANNEL_RESET(c->methods, c->devinfo)))
+ return (err);
+
+ if (fmt != 0 && spd != 0) {
+ if ((err = chn_setparam(c, fmt, spd)))
+ return (err);
fmt = 0;
spd = 0;
}
- if (r == 0 && fmt != 0)
- r = chn_setformat(c, fmt);
- if (r == 0 && spd != 0)
- r = chn_setspeed(c, spd);
- if (r == 0)
- r = chn_setlatency(c, chn_latency);
- if (r == 0) {
- chn_resetbuf(c);
- r = CHANNEL_RESETDONE(c->methods, c->devinfo);
- }
- return r;
+ if (fmt != 0 && (err = chn_setformat(c, fmt)))
+ return (err);
+ if (spd != 0 && (err = chn_setspeed(c, spd)))
+ return (err);
+
+ if ((err = chn_setlatency(c, chn_latency)))
+ return (err);
+
+ chn_resetbuf(c);
+
+ return (CHANNEL_RESETDONE(c->methods, c->devinfo));
}
static struct unrhdr *

File Metadata

Mime Type
text/plain
Expires
Wed, May 27, 6:09 AM (3 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30997986
Default Alt Text
D56264.id174942.diff (1 KB)

Event Timeline