Skip to content

L
linux-davinci
Commit 3a5e1d17 authored by Takashi Iwai's avatar Takashi Iwai
Browse files
Options

Merge branch 'topic/misc' into for-linus

parents 9d7eff60 8eca7538
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sound/pci/ice1712/ice1724.c
View file @ 3a5e1d17
...@@ -1239,7 +1239,7 @@ static int __devinit snd_vt1724_pcm_spdif(struct snd_ice1712 *ice, int device) ...@@ -1239,7 +1239,7 @@ static int __devinit snd_vt1724_pcm_spdif(struct snd_ice1712 *ice, int device)
if (ice->force_pdma4 || ice->force_rdma1) if (ice->force_pdma4 || ice->force_rdma1)
name = "ICE1724 Secondary"; name = "ICE1724 Secondary";
else else
name = "IEC1724 IEC958"; name = "ICE1724 IEC958";
err = snd_pcm_new(ice->card, name, device, play, capt, &pcm); err = snd_pcm_new(ice->card, name, device, play, capt, &pcm);
if (err < 0) if (err < 0)
return err; return err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment