Accepting request 129418 from home:tiwai:branches:multimedia:libs

- Fix useless assert in hctl, backport from upstream

OBS-URL: https://build.opensuse.org/request/show/129418
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=109

0016-hctl-Remove-a-useless-assert.patch

@@ -0,0 +1,31 @@
+From 86e27cdbf119440101a850e1b44baebfefe863ca Mon Sep 17 00:00:00 2001
+From: Martin Sandsmark <martin.sandsmark@kde.org>
+Date: Thu, 5 Jul 2012 09:40:07 +0200
+Subject: [PATCH] hctl: Remove a useless assert
+
+The case where the element is unavailable (for example gone away since
+the event was created) is handled beneath.
+
+See also bug 5471.
+	https://bugtrack.alsa-project.org/alsa-bug/view.php?id=5471
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+---
+ src/control/hcontrol.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/control/hcontrol.c b/src/control/hcontrol.c
+index 8ffc434..ee1d907 100644
+--- a/src/control/hcontrol.c
++++ b/src/control/hcontrol.c
+@@ -761,7 +761,6 @@ static int snd_hctl_handle_event(snd_hctl_t *hctl, snd_ctl_event_t *event)
+ 	if (event->data.elem.mask & (SNDRV_CTL_EVENT_MASK_VALUE |
+ 				     SNDRV_CTL_EVENT_MASK_INFO)) {
+ 		elem = snd_hctl_find_elem(hctl, &event->data.elem.id);
+-		assert(elem);
+ 		if (!elem)
+ 			return -ENOENT;
+ 		res = snd_hctl_elem_throw_event(elem, event->data.elem.mask &
+-- 
+1.7.10.4
+

alsa.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jul  5 10:11:35 CEST 2012 - tiwai@suse.de
+
+- Fix useless assert in hctl, backport from upstream
+
 -------------------------------------------------------------------
 Thu Jun 28 17:04:59 CEST 2012 - tiwai@suse.de
 

alsa.spec

@@ -68,6 +68,7 @@ Patch12:        0012-pcm_dsnoop-comment-fall-through-in-next-case.patch
 Patch13:        0013-tlv-improve-robustness-of-raw-value-ranges.patch
 Patch14:        0014-conf-Add-more-USB-devices-to-S-PDIF-blacklist.patch
 Patch15:        0015-Fix-the-binary-compatibility-of-ext-ctl-plugin-with-.patch
+Patch16:        0016-hctl-Remove-a-useless-assert.patch
 Patch99:        alsa-lib-doxygen-avoid-crash-for-11.3.diff
 Url:            http://www.alsa-project.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -133,6 +134,7 @@ Architecture.
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 %if %suse_version == 1130
 %patch99 -p1
 %endif