aboutsummaryrefslogtreecommitdiff
path: root/sound/isa
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-08-28 09:26:59 -0700
committerTakashi Iwai <tiwai@suse.de>2012-08-28 09:26:59 -0700
commita184d4e4591bb53fd8b91d6e8b85cffa261fb83e (patch)
treed8d530703e39fcfd612934105d5e1b5fab94d85c /sound/isa
parent5d908ab941e90291b5c31d990bdb8e87fa3f7146 (diff)
parentc36b5b054aaf14d68261970e3769398110e636d8 (diff)
downloadlinux-a184d4e4591bb53fd8b91d6e8b85cffa261fb83e.tar.gz
Merge branch 'for-linus' into for-next
Need to merge the fixes regarding EPSS. Conflicts: sound/pci/hda/hda_codec.c
Diffstat (limited to 'sound/isa')
-rw-r--r--sound/isa/als100.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/isa/als100.c b/sound/isa/als100.c
index 2d67c78c9f4b..f7cdaf51512d 100644
--- a/sound/isa/als100.c
+++ b/sound/isa/als100.c
@@ -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;
}