xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-linus' into for-next

Browse Source 
Conflicts:
	sound/pci/hda/hda_codec.c

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2012-08-20 22:14:26 +02:00
parent 099d53c308 535b6c51fe
commit ddf83485d7
38 changed files with 254 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/pci/cs46xx/cs46xx_lib.c
View File

@@ -94,7 +94,7 @@ static unsigned short snd_cs46xx_codec_read(struct snd_cs46xx *chip,
if (snd_BUG_ON(codec_index != CS46XX_PRIMARY_CODEC_INDEX &&
codec_index != CS46XX_SECONDARY_CODEC_INDEX))
return -EINVAL;
return 0xffff;
chip->active_ctrl(chip, 1);