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 
Need to merge the fixes regarding EPSS.

Conflicts:
	sound/pci/hda/hda_codec.c
This commit is contained in:
Takashi Iwai
2012-08-28 09:26:59 -07:00
parent 5d908ab941 c36b5b054a
commit a184d4e459
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/isa/als100.c
View File

@@ -233,7 +233,7 @@ static int __devinit snd_card_als100_probe(int dev,
irq[dev], dma8[dev], dma16[dev]);
}
if ((error = snd_sb16dsp_pcm(chip, 0, NULL)) < 0) {
if ((error = snd_sb16dsp_pcm(chip, 0, &chip->pcm)) < 0) {
snd_card_free(card);
return error;
}