summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2016-07-14 23:07:38 +0900
committerTakashi Iwai <tiwai@suse.de>2016-07-14 16:33:50 +0200
commitdf00246841948ca3b2773ca3484446f852097e60 (patch)
tree20fee7f02a4ce00b50ac1016f721cb2f0c924398
parent349920f93dc6e8be54e0fa21a0b2a31a412ccc1e (diff)
downloadalsa-lib-df00246841948ca3b2773ca3484446f852097e60.tar.gz
pcm: change code formatting for _snd_pcm_softvol_open()
This commit applies code format according to typical and moderate rule, for _snd_pcm_softvol_open(). Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--src/pcm/pcm_softvol.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/pcm/pcm_softvol.c b/src/pcm/pcm_softvol.c
index fc45d6db..e2345b35 100644
--- a/src/pcm/pcm_softvol.c
+++ b/src/pcm/pcm_softvol.c
@@ -1085,8 +1085,7 @@ int _snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name,
sformat != SND_PCM_FORMAT_S24_3LE &&
sformat != SND_PCM_FORMAT_S32_LE &&
sformat != SND_PCM_FORMAT_S32_BE) {
- SNDERR("only S16_LE, S16_BE, S24_3LE, S32_LE or S32_BE format "
- "is supported");
+ SNDERR("only S16_LE, S16_BE, S24_3LE, S32_LE or S32_BE format is supported");
snd_config_delete(sconf);
return -EINVAL;
}
@@ -1094,12 +1093,15 @@ int _snd_pcm_softvol_open(snd_pcm_t **pcmp, const char *name,
snd_config_delete(sconf);
if (err < 0)
return err;
- if ((err = snd_pcm_parse_control_id(control, ctl_id, &card, &cchannels, NULL)) < 0) {
+ err = snd_pcm_parse_control_id(control, ctl_id, &card,
+ &cchannels, NULL);
+ if (err < 0) {
snd_pcm_close(spcm);
return err;
}
- err = snd_pcm_softvol_open(pcmp, name, sformat, card, ctl_id, cchannels,
- min_dB, max_dB, resolution, spcm, 1);
+ err = snd_pcm_softvol_open(pcmp, name, sformat, card, ctl_id,
+ cchannels, min_dB, max_dB,
+ resolution, spcm, 1);
if (err < 0)
snd_pcm_close(spcm);
}