Merge branch 'topic/udev-id-rename' into to-push

2 files changed, 2 insertions, 2 deletions

diff --git a/sound/pci/rme9652/hdsp.c b/sound/pci/rme9652/hdsp.c
index f87ff0497116..44d0c15e2b71 100644
--- a/sound/pci/rme9652/hdsp.c
+++ b/sound/pci/rme9652/hdsp.c
@@ -1452,7 +1452,7 @@ static int snd_hdsp_create_midi (struct snd_card *card, struct hdsp *hdsp, int i
         if (snd_rawmidi_new (card, buf, id, 1, 1, &hdsp->midi[id].rmidi) < 0)
                 return -1;
 
-        sprintf (hdsp->midi[id].rmidi->name, "%s MIDI %d", card->id, id+1);
+        sprintf(hdsp->midi[id].rmidi->name, "HDSP MIDI %d", id+1);
         hdsp->midi[id].rmidi->private_data = &hdsp->midi[id];
 
         snd_rawmidi_set_ops (hdsp->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_hdsp_midi_output);
diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c
index d7dd53675ccd..71231cf1b2b0 100644
--- a/sound/pci/rme9652/hdspm.c
+++ b/sound/pci/rme9652/hdspm.c
@@ -1293,7 +1293,7 @@ static int __devinit snd_hdspm_create_midi (struct snd_card *card,
         if (err < 0)
                 return err;
 
-        sprintf (hdspm->midi[id].rmidi->name, "%s MIDI %d", card->id, id+1);
+        sprintf(hdspm->midi[id].rmidi->name, "HDSPM MIDI %d", id+1);
         hdspm->midi[id].rmidi->private_data = &hdspm->midi[id];
 
         snd_rawmidi_set_ops(hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT,