diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-10-28 12:43:29 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-10-28 12:43:34 +0100 |
| commit | e2e556a9549eebde9797a04729efdfc54f37e5cc (patch) | |
| tree | be8e60c5c7021ebb3bda12ebe8a921fbb8883c4e /sound/firewire | |
| parent | 0a671dc500553cf6f4cc3efbcb0923b5e9adccb5 (diff) | |
| parent | 1a7f60b9df614bb36d14dc0c0bc898a31b2b506f (diff) | |
| download | linux-e2e556a9549eebde9797a04729efdfc54f37e5cc.tar.bz2 | |
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')
| -rw-r--r-- | sound/firewire/bebob/bebob_stream.c | 3 |
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; |