]> git.alsa-project.org Git - alsa-lib.git/commitdiff
topology: Fix comparison of unsigned expression < 0
authorMengdong Lin <mengdong.lin@linux.intel.com>
Wed, 18 Nov 2015 07:23:59 +0000 (02:23 -0500)
committerTakashi Iwai <tiwai@suse.de>
Wed, 18 Nov 2015 13:57:14 +0000 (14:57 +0100)
Fix gcc warning: comparison of unsigned expression < 0 is always false
[-Wtype-limits]

The ABI object channel->id is _le32 and is converted to host unsigned
integer. It cannot be < 0.

Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
src/topology/channel.c

index 9bc5d5a77c57bb1355a98dafe363b9a50b7a9d91..c2f1feadca9a8cd0eabf0cb4c0e3d9181a6385e7 100644 (file)
@@ -80,6 +80,7 @@ int tplg_parse_channel(snd_tplg_t *tplg,
        snd_config_t *n;
        struct snd_soc_tplg_channel *channel = private;
        const char *id, *value;
+       int channel_id;
 
        if (tplg->channel_idx >= SND_SOC_TPLG_MAX_CHAN)
                return -EINVAL;
@@ -88,12 +89,13 @@ int tplg_parse_channel(snd_tplg_t *tplg,
        snd_config_get_id(cfg, &id);
        tplg_dbg("\tChannel %s at index %d\n", id, tplg->channel_idx);
 
-       channel->id = lookup_channel(id);
-       if (channel->id < 0) {
+       channel_id = lookup_channel(id);
+       if (channel_id < 0) {
                SNDERR("error: invalid channel %s\n", id);
                return -EINVAL;
        }
 
+       channel->id = channel_id;
        channel->size = sizeof(*channel);
        tplg_dbg("\tChan %s = %d\n", id, channel->id);