Skip to content

Commit

Permalink
ALSA: xen-front: fix unsigned error check on return from to_sndif_format
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Takashi Sakamoto <[email protected]>
Signed-off-by: Takashi Iwai <[email protected]>
  • Loading branch information
Colin Ian King authored and tiwai committed May 28, 2018
1 parent 3d62461 commit 014cea5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions sound/xen/xen_snd_front_alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 014cea5

Please sign in to comment.