Takashi Iwai
bed9c86d2d
- backport upstream fixes: * Add support for Echo3G devices * Blacklist iec958 for some USB devices * Remove redundant CHECK_ENUM() from snd_mixer_selem_is_enum*() * Document fixes / updates * Add ability to specify TLV data to external control plugins * Fix invalid long long format specifier * Fix missing break in PCM non-interleaved mmap handling * improve robustness of TLV raw value ranges OBS-URL: https://build.opensuse.org/request/show/122709 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=101
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 2ab86d96c9c9f63212eee89f92f516d537b086e1 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Tue, 13 Mar 2012 14:30:22 +0100
|
|
Subject: [PATCH 04/14] mixer: Remove redundant CHECK_ENUM() from
|
|
snd_mixer_selem_is_enum*()
|
|
|
|
The functions to check whether the element is an enum don't need the
|
|
extra check of the type. It should return simply 0 or 1 without error.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/mixer/simple.c | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/src/mixer/simple.c b/src/mixer/simple.c
|
|
index 8079fe7..ec22a9c 100644
|
|
--- a/src/mixer/simple.c
|
|
+++ b/src/mixer/simple.c
|
|
@@ -889,7 +889,6 @@ int snd_mixer_selem_is_enumerated(snd_mixer_elem_t *elem)
|
|
int snd_mixer_selem_is_enum_playback(snd_mixer_elem_t *elem)
|
|
{
|
|
CHECK_BASIC(elem);
|
|
- CHECK_ENUM(elem);
|
|
return sm_selem_ops(elem)->is(elem, SM_PLAY, SM_OPS_IS_ENUMERATED, 1);
|
|
}
|
|
|
|
@@ -901,7 +900,6 @@ int snd_mixer_selem_is_enum_playback(snd_mixer_elem_t *elem)
|
|
int snd_mixer_selem_is_enum_capture(snd_mixer_elem_t *elem)
|
|
{
|
|
CHECK_BASIC(elem);
|
|
- CHECK_ENUM(elem);
|
|
return sm_selem_ops(elem)->is(elem, SM_CAPT, SM_OPS_IS_ENUMERATED, 1);
|
|
}
|
|
|
|
--
|
|
1.7.9.2
|
|
|