1 files changed, 7 insertions, 9 deletions

diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c
index f104c68fe1e0..acc12f004c23 100644
--- a/sound/usb/quirks.c
+++ b/sound/usb/quirks.c
@@ -306,7 +306,6 @@ int snd_usb_create_quirk(struct snd_usb_audio *chip,
                 [QUIRK_MIDI_YAMAHA] = create_any_midi_quirk,
                 [QUIRK_MIDI_MIDIMAN] = create_any_midi_quirk,
                 [QUIRK_MIDI_NOVATION] = create_any_midi_quirk,
-                [QUIRK_MIDI_MBOX2] = create_any_midi_quirk,
                 [QUIRK_MIDI_RAW_BYTES] = create_any_midi_quirk,
                 [QUIRK_MIDI_EMAGIC] = create_any_midi_quirk,
                 [QUIRK_MIDI_CME] = create_any_midi_quirk,
@@ -528,11 +527,11 @@ static void mbox2_setup_48_24_magic(struct usb_device *dev)
 #define MBOX2_BOOT_LOADING     0x01 /* Hard coded into the device */
 #define MBOX2_BOOT_READY       0x02 /* Hard coded into the device */
 
-int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
+static int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
 {
         struct usb_host_config *config = dev->actconfig;
         int err;
-        u8 bootresponse;
+        u8 bootresponse[12];
         int fwsize;
         int count;
 
@@ -546,20 +545,20 @@ int snd_usb_mbox2_boot_quirk(struct usb_device *dev)
         snd_printd("usb-audio: Sending Digidesign Mbox 2 boot sequence...\n");
 
         count = 0;
-        bootresponse = MBOX2_BOOT_LOADING;
-        while ((bootresponse == MBOX2_BOOT_LOADING) && (count < 10)) {
+        bootresponse[0] = MBOX2_BOOT_LOADING;
+        while ((bootresponse[0] == MBOX2_BOOT_LOADING) && (count < 10)) {
                 msleep(500); /* 0.5 second delay */
                 snd_usb_ctl_msg(dev, usb_rcvctrlpipe(dev, 0),
                         /* Control magic - load onboard firmware */
                         0x85, 0xc0, 0x0001, 0x0000, &bootresponse, 0x0012);
-                if (bootresponse == MBOX2_BOOT_READY)
+                if (bootresponse[0] == MBOX2_BOOT_READY)
                         break;
                 snd_printd("usb-audio: device not ready, resending boot sequence...\n");
                 count++;
         }
 
-        if (bootresponse != MBOX2_BOOT_READY) {
-                snd_printk(KERN_ERR "usb-audio: Unknown bootresponse=%d, or timed out, ignoring device.\n", bootresponse);
+        if (bootresponse[0] != MBOX2_BOOT_READY) {
+                snd_printk(KERN_ERR "usb-audio: Unknown bootresponse=%d, or timed out, ignoring device.\n", bootresponse[0]);
                 return -ENODEV;
         }
 
@@ -660,7 +659,6 @@ static int audiophile_skip_setting_quirk(struct snd_usb_audio *chip,
         return 0; /* keep this altsetting */
 }
 
-
 static int fasttrackpro_skip_setting_quirk(struct snd_usb_audio *chip,
                                            int iface, int altno)
 {