| From f2bbdbcb075f3977a53da3bdcb7cd460bc8ae5f2 Mon Sep 17 00:00:00 2001 |
| From: Takashi Sakamoto <o-takashi@sakamocchi.jp> |
| Date: Sat, 26 Oct 2019 12:06:20 +0900 |
| Subject: ALSA: bebob: Fix prototype of helper function to return negative value |
| |
| From: Takashi Sakamoto <o-takashi@sakamocchi.jp> |
| |
| commit f2bbdbcb075f3977a53da3bdcb7cd460bc8ae5f2 upstream. |
| |
| A helper function of ALSA bebob driver returns negative value in a |
| function which has a prototype to return unsigned value. |
| |
| This commit fixes it by changing the prototype. |
| |
| Fixes: eb7b3a056cd8 ("ALSA: bebob: Add commands and connections/streams management") |
| Cc: <stable@vger.kernel.org> # v3.16+ |
| Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> |
| Link: https://lore.kernel.org/r/20191026030620.12077-1-o-takashi@sakamocchi.jp |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/firewire/bebob/bebob_stream.c | 3 +-- |
| 1 file changed, 1 insertion(+), 2 deletions(-) |
| |
| --- a/sound/firewire/bebob/bebob_stream.c |
| +++ b/sound/firewire/bebob/bebob_stream.c |
| @@ -252,8 +252,7 @@ end: |
| return err; |
| } |
| |
| -static unsigned int |
| -map_data_channels(struct snd_bebob *bebob, struct amdtp_stream *s) |
| +static int map_data_channels(struct snd_bebob *bebob, struct amdtp_stream *s) |
| { |
| unsigned int sec, sections, ch, channels; |
| unsigned int pcm, midi, location; |