Merge branch 'topic/misc' into for-next

[karo-tx-linux.git] / sound / pci / au88x0 / au88x0_pcm.c

diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c
index 5439d662d1047377ddd7d832dbd1791e0ce887fe..1b6ed8e1abf553db1b3c816a7f008b6c86028fc8 100644 (file)
--- a/sound/pci/au88x0/au88x0_pcm.c
+++ b/sound/pci/au88x0/au88x0_pcm.c
@@ -423,11 +423,11 @@ static struct snd_pcm_ops snd_vortex_playback_ops = {
 */
 
 static char *vortex_pcm_prettyname[VORTEX_PCM_LAST] = {
-       "AU88x0 ADB",
-       "AU88x0 SPDIF",
-       "AU88x0 A3D",
-       "AU88x0 WT",
-       "AU88x0 I2S",
+       CARD_NAME " ADB",
+       CARD_NAME " SPDIF",
+       CARD_NAME " A3D",
+       CARD_NAME " WT",
+       CARD_NAME " I2S",
 };
 static char *vortex_pcm_name[VORTEX_PCM_LAST] = {
        "adb",
@@ -515,7 +515,7 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
                return -ENODEV;
 
        /* idx indicates which kind of PCM device. ADB, SPDIF, I2S and A3D share the 
-        * same dma engine. WT uses it own separate dma engine whcih cant capture. */
+        * same dma engine. WT uses it own separate dma engine which can't capture. */
        if (idx == VORTEX_PCM_ADB)
                nr_capt = nr;
        else
@@ -524,7 +524,8 @@ static int __devinit snd_vortex_new_pcm(vortex_t *chip, int idx, int nr)
                          nr_capt, &pcm);
        if (err < 0)
                return err;
-       strcpy(pcm->name, vortex_pcm_name[idx]);
+       snprintf(pcm->name, sizeof(pcm->name),
+               "%s %s", CARD_NAME_SHORT, vortex_pcm_name[idx]);
        chip->pcm[idx] = pcm;
        // This is an evil hack, but it saves a lot of duplicated code.
        VORTEX_PCM_TYPE(pcm) = idx;