diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:34 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-25 05:40:34 -0500 |
| commit | 5ce442fe2c9423ec5451222aee6f9b2127bb8311 (patch) | |
| tree | 9cb12cf2c4ab5a8af5de219c22eade3908b5cb59 /sound/pci | |
| parent | 60cda2b53a7826d273198f668cd124f0eeda0e4a (diff) | |
| parent | 2af752936b311a846622668f8b0f1893d8eccade (diff) | |
Merge branch 'topic/udev-id-rename' into to-push
Diffstat (limited to 'sound/pci')
| -rw-r--r-- | sound/pci/rme9652/hdsp.c | 2 | ||||
| -rw-r--r-- | sound/pci/rme9652/hdspm.c | 2 |
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 | |||
| 1452 | if (snd_rawmidi_new (card, buf, id, 1, 1, &hdsp->midi[id].rmidi) < 0) | 1452 | if (snd_rawmidi_new (card, buf, id, 1, 1, &hdsp->midi[id].rmidi) < 0) |
| 1453 | return -1; | 1453 | return -1; |
| 1454 | 1454 | ||
| 1455 | sprintf (hdsp->midi[id].rmidi->name, "%s MIDI %d", card->id, id+1); | 1455 | sprintf(hdsp->midi[id].rmidi->name, "HDSP MIDI %d", id+1); |
| 1456 | hdsp->midi[id].rmidi->private_data = &hdsp->midi[id]; | 1456 | hdsp->midi[id].rmidi->private_data = &hdsp->midi[id]; |
| 1457 | 1457 | ||
| 1458 | snd_rawmidi_set_ops (hdsp->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, &snd_hdsp_midi_output); | 1458 | 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, | |||
| 1293 | if (err < 0) | 1293 | if (err < 0) |
| 1294 | return err; | 1294 | return err; |
| 1295 | 1295 | ||
| 1296 | sprintf (hdspm->midi[id].rmidi->name, "%s MIDI %d", card->id, id+1); | 1296 | sprintf(hdspm->midi[id].rmidi->name, "HDSPM MIDI %d", id+1); |
| 1297 | hdspm->midi[id].rmidi->private_data = &hdspm->midi[id]; | 1297 | hdspm->midi[id].rmidi->private_data = &hdspm->midi[id]; |
| 1298 | 1298 | ||
| 1299 | snd_rawmidi_set_ops(hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, | 1299 | snd_rawmidi_set_ops(hdspm->midi[id].rmidi, SNDRV_RAWMIDI_STREAM_OUTPUT, |