1 files changed, 9 insertions, 6 deletions

diff --git a/sound/usb/midi.c b/sound/usb/midi.c
index 007cf5831121..47de8af42f16 100644
--- a/sound/usb/midi.c
+++ b/sound/usb/midi.c
@@ -2320,10 +2320,11 @@ EXPORT_SYMBOL(snd_usbmidi_resume);
 /*
  * Creates and registers everything needed for a MIDI streaming interface.
  */
-int snd_usbmidi_create(struct snd_card *card,
-                       struct usb_interface *iface,
-                       struct list_head *midi_list,
-                       const struct snd_usb_audio_quirk *quirk)
+int __snd_usbmidi_create(struct snd_card *card,
+                         struct usb_interface *iface,
+                         struct list_head *midi_list,
+                         const struct snd_usb_audio_quirk *quirk,
+                         unsigned int usb_id)
 {
         struct snd_usb_midi *umidi;
         struct snd_usb_midi_endpoint_info endpoints[MIDI_MAX_ENDPOINTS];
@@ -2341,8 +2342,10 @@ int snd_usbmidi_create(struct snd_card *card,
         spin_lock_init(&umidi->disc_lock);
         init_rwsem(&umidi->disc_rwsem);
         mutex_init(&umidi->mutex);
-        umidi->usb_id = USB_ID(le16_to_cpu(umidi->dev->descriptor.idVendor),
+        if (!usb_id)
+                usb_id = USB_ID(le16_to_cpu(umidi->dev->descriptor.idVendor),
                                le16_to_cpu(umidi->dev->descriptor.idProduct));
+        umidi->usb_id = usb_id;
         setup_timer(&umidi->error_timer, snd_usbmidi_error_timer,
                     (unsigned long)umidi);
 
@@ -2463,4 +2466,4 @@ int snd_usbmidi_create(struct snd_card *card,
         list_add_tail(&umidi->list, midi_list);
         return 0;
 }
-EXPORT_SYMBOL(snd_usbmidi_create);
+EXPORT_SYMBOL(__snd_usbmidi_create);