ALSA CVS update - Clemens Ladisch <clemens@ladisch.de>

USB generic driver
don't resubmit unlinked urbs;
move interface releasing after urb unlinking

diff --git a/sound/usb/usbmidi.c b/sound/usb/usbmidi.c
index 8659e08b4ddbabedb6dd2868f40ebbb2aafbbb43..443365a360cecba3a49bfcfef134dd9b1384ee68 100644 (file)
--- a/sound/usb/usbmidi.c
+++ b/sound/usb/usbmidi.c
@@ -143,8 +143,9 @@ static int snd_usbmidi_urb_error(int status)
        if (status == -ENOENT)
                return status; /* killed */
        if (status == -EILSEQ ||
+           status == -ECONNRESET ||
            status == -ETIMEDOUT)
-               return -ENODEV; /* device removed */
+               return -ENODEV; /* device removed/shutdown */
        snd_printk(KERN_ERR "urb status %d\n", status);
        return 0; /* continue */
 }
@@ -706,7 +707,6 @@ void snd_usbmidi_disconnect(struct list_head* p, struct usb_driver *driver)
        int i;
 
        umidi = list_entry(p, snd_usb_midi_t, list);
-       usb_driver_release_interface(driver, umidi->iface);
        for (i = 0; i < MIDI_MAX_ENDPOINTS; ++i) {
                snd_usb_midi_endpoint_t* ep = &umidi->endpoints[i];
                if (ep->out && ep->out->urb)
@@ -714,6 +714,7 @@ void snd_usbmidi_disconnect(struct list_head* p, struct usb_driver *driver)
                if (ep->in && ep->in->urb)
                        usb_unlink_urb(ep->in->urb);
        }
+       usb_driver_release_interface(driver, umidi->iface);
 }
 
 static void snd_usbmidi_rawmidi_free(snd_rawmidi_t* rmidi)