diff --git a/[refs] b/[refs]
index 1e5940b5f9d5..fdcb97253bfd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 669faba27f2f7b04b9228d20e30e7f584f0becd5
+refs/heads/master: 7a17daae8ed71bf3259d905a4fc48a5b424fa935
diff --git a/trunk/sound/usb/usbmidi.c b/trunk/sound/usb/usbmidi.c
index c0c7770198ad..5962e4b84423 100644
--- a/trunk/sound/usb/usbmidi.c
+++ b/trunk/sound/usb/usbmidi.c
@@ -1112,6 +1112,15 @@ void snd_usbmidi_disconnect(struct list_head* p)
 		}
 		if (ep->in)
 			usb_kill_urb(ep->in->urb);
+		/* free endpoints here; later call can result in Oops */
+		if (ep->out) {
+			snd_usbmidi_out_endpoint_delete(ep->out);
+			ep->out = NULL;
+		}
+		if (ep->in) {
+			snd_usbmidi_in_endpoint_delete(ep->in);
+			ep->in = NULL;
+		}
 	}
 	del_timer_sync(&umidi->error_timer);
 }