Takashi Iwai
4f970fe93d
- Remove hackish modprobe install scripts for auto-loading OSS and sequencer modules (bsc#1136562); it's invoked from systemd unit file included in alsa-utils now - Backport upstream fixes: 0001-pcm-direct-Add-generic-hw_ptr_alignment-function-for.patch 0002-pcm-dshare-Added-hw_ptr_alignment-option-in-configur.patch 0003-pcm-dsnoop-Added-hw_ptr_alignment-option-in-configur.patch 0004-pcm-file-add-support-for-infile-reading-in-non-inter.patch 0005-pcm-file-use-snd_pcm_file_areas_read_infile-for-read.patch 0006-pcm-file-add-missing-unlock-on-early-return.patch 0007-ucm-Add-UCM-profile-for-CX2072X-codec-on-Baytrail-Ch.patch 0008-pcm-add-mmap_begin-callback-to-snd_pcm_fast_ops_t-ap.patch 0009-pcm-file-add-infile-read-support-for-mmap-mode.patch 0010-aserver-fix-resource-leak-coverity.patch 0011-src-conf.c-add-missing-va_end-call-coverity.patch 0012-config-parse_string-fix-the-dynamic-buffer-allocatio.patch 0013-control_shm-remove-duplicate-code-coverity.patch 0014-control_shm-add-missing-socket-close-to-the-error-pa.patch 0015-pcm-fix-memory-leak-in-_snd_pcm_parse_config_chmaps-.patch 0016-pcm_file-call-pclose-correctly-for-popen-coverity.patch 0017-pcm_hw-close-file-descriptor-in-the-error-path-in-sn.patch 0018-rawmidi-use-snd_dlobj_cache_get2-in-rawmidi-open-cov.patch 0019-rawmidi_hw-add-sanity-check-for-the-invalid-stream-a.patch 0020-topology-various-coverity-fixes.patch 0021-ucm-coverity-fixes.patch 0022-pcm_file-coverity-fixes-including-double-locking.patch 0023-topology-next-round-of-coverity-fixes.patch 0024-pcm_file-another-locking-fix-coverity.patch 0025-ucm-another-coverity-fix-in-uc_mgr_config_load.patch - Drop the downstream CX2072X UCM profile, which is replaced with OBS-URL: https://build.opensuse.org/request/show/706089 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=253
62 lines
1.9 KiB
Diff
62 lines
1.9 KiB
Diff
From 51881cacc05e7d5e3cc8fc1ec9a4ac93a6327703 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Fri, 24 May 2019 10:51:47 +0200
|
|
Subject: [PATCH 13/25] control_shm: remove duplicate code (coverity)
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/control/control_shm.c | 18 +++---------------
|
|
1 file changed, 3 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/src/control/control_shm.c b/src/control/control_shm.c
|
|
index d7b4139831d0..1d9de8b75860 100644
|
|
--- a/src/control/control_shm.c
|
|
+++ b/src/control/control_shm.c
|
|
@@ -302,13 +302,9 @@ static int snd_ctl_shm_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev)
|
|
{
|
|
snd_ctl_shm_t *shm = ctl->private_data;
|
|
volatile snd_ctl_shm_ctrl_t *ctrl = shm->ctrl;
|
|
- int err;
|
|
ctrl->u.pcm_prefer_subdevice = subdev;
|
|
ctrl->cmd = SNDRV_CTL_IOCTL_PCM_PREFER_SUBDEVICE;
|
|
- err = snd_ctl_shm_action(ctl);
|
|
- if (err < 0)
|
|
- return err;
|
|
- return err;
|
|
+ return snd_ctl_shm_action(ctl);
|
|
}
|
|
|
|
static int snd_ctl_shm_rawmidi_next_device(snd_ctl_t *ctl, int * device)
|
|
@@ -343,26 +339,18 @@ static int snd_ctl_shm_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev)
|
|
{
|
|
snd_ctl_shm_t *shm = ctl->private_data;
|
|
volatile snd_ctl_shm_ctrl_t *ctrl = shm->ctrl;
|
|
- int err;
|
|
ctrl->u.rawmidi_prefer_subdevice = subdev;
|
|
ctrl->cmd = SNDRV_CTL_IOCTL_RAWMIDI_PREFER_SUBDEVICE;
|
|
- err = snd_ctl_shm_action(ctl);
|
|
- if (err < 0)
|
|
- return err;
|
|
- return err;
|
|
+ return snd_ctl_shm_action(ctl);
|
|
}
|
|
|
|
static int snd_ctl_shm_set_power_state(snd_ctl_t *ctl, unsigned int state)
|
|
{
|
|
snd_ctl_shm_t *shm = ctl->private_data;
|
|
volatile snd_ctl_shm_ctrl_t *ctrl = shm->ctrl;
|
|
- int err;
|
|
ctrl->u.power_state = state;
|
|
ctrl->cmd = SNDRV_CTL_IOCTL_POWER;
|
|
- err = snd_ctl_shm_action(ctl);
|
|
- if (err < 0)
|
|
- return err;
|
|
- return err;
|
|
+ return snd_ctl_shm_action(ctl);
|
|
}
|
|
|
|
static int snd_ctl_shm_get_power_state(snd_ctl_t *ctl, unsigned int *state)
|
|
--
|
|
2.16.4
|
|
|