diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-05 12:34:25 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-05 12:34:25 -0500 |
| commit | 3a5e1d1792729f384c10db966feb8bab76c991ed (patch) | |
| tree | c62f5a3afb16fc8e10e04cb1dd972d9ef5e47f25 /sound/pci | |
| parent | 9d7eff608dbccceb3a5168bd240dc6262ae42459 (diff) | |
| parent | 8eca75382e012b74b98526a1679ada2a1849024b (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/ice1712/ice1724.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c index 0dfa0540ce2c..bb8d8c766b9d 100644 --- a/sound/pci/ice1712/ice1724.c +++ b/sound/pci/ice1712/ice1724.c | |||
| @@ -1239,7 +1239,7 @@ static int __devinit snd_vt1724_pcm_spdif(struct snd_ice1712 *ice, int device) | |||
| 1239 | if (ice->force_pdma4 || ice->force_rdma1) | 1239 | if (ice->force_pdma4 || ice->force_rdma1) |
| 1240 | name = "ICE1724 Secondary"; | 1240 | name = "ICE1724 Secondary"; |
| 1241 | else | 1241 | else |
| 1242 | name = "IEC1724 IEC958"; | 1242 | name = "ICE1724 IEC958"; |
| 1243 | err = snd_pcm_new(ice->card, name, device, play, capt, &pcm); | 1243 | err = snd_pcm_new(ice->card, name, device, play, capt, &pcm); |
| 1244 | if (err < 0) | 1244 | if (err < 0) |
| 1245 | return err; | 1245 | return err; |