Merge branch 'topic/misc' into for-linus

diff --git a/sound/pci/ice1712/ice1724.c b/sound/pci/ice1712/ice1724.c
index 0dfa0540ce2cb917991d058d8c6aa9d88e6329ba..bb8d8c766b9d1f5ee5e08f85a8a36694ac1b8058 100644 (file)
--- 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)
        if (ice->force_pdma4 || ice->force_rdma1)
                name = "ICE1724 Secondary";
        else
-               name = "IEC1724 IEC958";
+               name = "ICE1724 IEC958";
        err = snd_pcm_new(ice->card, name, device, play, capt, &pcm);
        if (err < 0)
                return err;