aboutsummaryrefslogtreecommitdiff
path: root/sound/xen
diff options
context:
space:
mode:
authorColin Ian King <colin.king@canonical.com>2018-05-27 22:32:19 +0100
committerTakashi Iwai <tiwai@suse.de>2018-05-28 11:30:33 +0200
commit014cea591afac9b3dae61793446f83d5be634203 (patch)
tree74f51d3aa884454b4c6d8dc3003ebd813d61c1c4 /sound/xen
parent3d6246173798fc7a81a69ad3fd0dd55fa1779068 (diff)
downloadlinux-stericsson-014cea591afac9b3dae61793446f83d5be634203.tar.gz
ALSA: xen-front: fix unsigned error check on return from to_sndif_format
The negative error return from the call to to_sndif_format is being assigned to an unsigned 8 bit integer and hence the check for a negative value is always going to be false. Fix this by using ret as the error return and hence the negative error can be detected and assign the u8 sndif_format to ret if there is no error. Detected by CoverityScan, CID#1469385 ("Unsigned compared against 0") Signed-off-by: Colin Ian King <colin.king@canonical.com> Reviewed-by: Takashi Sakamoto <o-takashi@sakamoccchi.jp> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/xen')
-rw-r--r--sound/xen/xen_snd_front_alsa.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/xen/xen_snd_front_alsa.c b/sound/xen/xen_snd_front_alsa.c
index 5041f83e98d2..5a2bd70a2fa1 100644
--- a/sound/xen/xen_snd_front_alsa.c
+++ b/sound/xen/xen_snd_front_alsa.c
@@ -466,13 +466,14 @@ static int alsa_prepare(struct snd_pcm_substream *substream)
u8 sndif_format;
int ret;
- sndif_format = to_sndif_format(runtime->format);
- if (sndif_format < 0) {
+ ret = to_sndif_format(runtime->format);
+ if (ret < 0) {
dev_err(&stream->front_info->xb_dev->dev,
"Unsupported sample format: %d\n",
runtime->format);
- return sndif_format;
+ return ret;
}
+ sndif_format = ret;
ret = xen_snd_front_stream_prepare(&stream->evt_pair->req,
&stream->sh_buf,