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>
This commit is contained in:
@@ -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;
|
||||
|
Reference in New Issue
Block a user