summaryrefslogtreecommitdiff
path: root/sound/firewire/bebob
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-10-28 14:43:29 +0300
committerTakashi Iwai <tiwai@suse.de>2019-10-28 14:43:34 +0300
commite2e556a9549eebde9797a04729efdfc54f37e5cc (patch)
treebe8e60c5c7021ebb3bda12ebe8a921fbb8883c4e /sound/firewire/bebob
parent0a671dc500553cf6f4cc3efbcb0923b5e9adccb5 (diff)
parent1a7f60b9df614bb36d14dc0c0bc898a31b2b506f (diff)
downloadlinux-e2e556a9549eebde9797a04729efdfc54f37e5cc.tar.xz
Merge branch 'for-linus' into for-next
Back-merge the development process for catching up the HD-audio fix (and apply a new one on top of that). Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/bebob')
-rw-r--r--sound/firewire/bebob/bebob_stream.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/firewire/bebob/bebob_stream.c b/sound/firewire/bebob/bebob_stream.c
index 7ac0d9f495c4..f7f0db5aa811 100644
--- 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;