Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

[powerpc.git] / sound / usb / usx2y / usbusx2y.c

diff --git a/sound/usb/usx2y/usbusx2y.c b/sound/usb/usx2y/usbusx2y.c
index 89ee8b7..cf77313 100644 (file)
--- a/sound/usb/usx2y/usbusx2y.c
+++ b/sound/usb/usx2y/usbusx2y.c
@@ -251,9 +251,8 @@ static void i_usX2Y_In04Int(struct urb* urb, struct pt_regs *regs)
                        }
                }
 
-       if (err) {
-               snd_printk("In04Int() usb_submit_urb err=%i\n", err);
-       }
+       if (err)
+               snd_printk(KERN_ERR "In04Int() usb_submit_urb err=%i\n", err);
 
        urb->dev = usX2Y->chip.dev;
        usb_submit_urb(urb, GFP_ATOMIC);
@@ -442,7 +441,7 @@ static void usX2Y_usb_disconnect(struct usb_device* device, void* ptr)
                snd_card_disconnect((snd_card_t*)ptr);
                /* release the midi resources */
                list_for_each(p, &usX2Y->chip.midi_list) {
-                       snd_usbmidi_disconnect(p, &snd_usX2Y_usb_driver);
+                       snd_usbmidi_disconnect(p);
                }
                if (usX2Y->us428ctls_sharedmem) 
                        wake_up(&usX2Y->us428ctls_wait_queue_head);