Takashi Iwai
ccef10ef6c
- Backport alsa-lib fixes from upstream: 0001-Fix-alsa-lib-to-regard-3D-control-Depth-as-Playback-.patch 0002-alsa-lib-add-LaCie-Firewire-Speakers-Griffin-FireWav.patch 0003-alsa-lib-ucm-allow-values-to-be-read-from-devices.patch 0004-UCM-comment-fixes-and-fix-myvalue-initialization-fix.patch 0005-UCM-Fix-empty-get_list-initialize-returned-pointer-t.patch 0006-Conf-Fix-channels-of-ICE1712-to-10-12.patch 0007-UCM-Fix-LGPL-licence-how-to-receive-part-referred-GP.patch 0008-configure-Fail-when-the-user-attempts-to-compile-sha.patch 0009-Mark-Heaphone-Center-LFE-control-of-emu10k1-conf-as-.patch 0010-Fix-typo-in-comment-in-surround71.conf.patch 0011-test-latency-print-error-message-when-2-periods-per-.patch 0012-EMU10K1.conf-Don-t-lock-hook-controls.patch 0013-HDA-Intel.conf-Fix-low-mic-volume-due-to-pulseaudio-.patch 0014-alsa-lib-fixed-coverity-reported-issues-under-FORWAR.patch 0015-Fix-compile-warnings.patch 0016-Fix-printf-for-size_t.patch 0018-UCM-fix-memory-leak-when-executing-cset-commands.patch 0019-Specficy-subdevice-0-for-front-surround-of-HDA-Intel.patch 0020-emu10k1.conf-Fix-no-sound-problem-when-using-SB-Live.patch 0021-ctlparse-Respect-softfloat-configure-option.patch 0022-UCM-Fix-typo-in-error-message.patch 0023-UCM-Fix-deadlock-following-failed-get-_verb.patch OBS-URL: https://build.opensuse.org/request/show/72599 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=80
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From 75194776a79ddd23b764138dc7c3a2e224b439a0 Mon Sep 17 00:00:00 2001
|
||
From: Takashi Iwai <tiwai@suse.de>
|
||
Date: Wed, 4 May 2011 09:14:29 +0200
|
||
Subject: [PATCH 15/23] Fix compile warnings
|
||
MIME-Version: 1.0
|
||
Content-Type: text/plain; charset=UTF-8
|
||
Content-Transfer-Encoding: 8bit
|
||
|
||
strstr() returns a char pointer
|
||
|
||
simple_none.c: In function ‘base_len’:
|
||
simple_none.c:940:33: warning: ordered comparison of pointer with integer zero
|
||
simple_none.c:941:29: warning: ordered comparison of pointer with integer zero
|
||
|
||
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
||
---
|
||
src/mixer/simple_none.c | 4 ++--
|
||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
||
diff --git a/src/mixer/simple_none.c b/src/mixer/simple_none.c
|
||
index 395e4d6..b11e9e8 100644
|
||
--- a/src/mixer/simple_none.c
|
||
+++ b/src/mixer/simple_none.c
|
||
@@ -937,8 +937,8 @@ static int base_len(const char *name, selem_ctl_type_t *type)
|
||
*type = CTL_CAPTURE_ROUTE;
|
||
return strlen(name);
|
||
}
|
||
- if (strstr(name, "3D Control") > 0) {
|
||
- if (strstr(name, "Depth") > 0) {
|
||
+ if (strstr(name, "3D Control")) {
|
||
+ if (strstr(name, "Depth")) {
|
||
*type = CTL_PLAYBACK_VOLUME;
|
||
return strlen(name);
|
||
}
|
||
--
|
||
1.7.5.3
|
||
|