Merge tag 'v3.17-rc1' into patchwork

[linux-2.6-microblaze.git] / sound / oss / mpu401.c

diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index 3bbc3ec..8627350 100644 (file)
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -316,6 +316,7 @@ static int mpu_input_scanner(struct mpu_config *devc, unsigned char midic)
                                case 0xf6:
                                        /* printk( "tune_request\n"); */
                                        devc->m_state = ST_INIT;
+                                       break;
 
                                        /*
                                         *    Real time messages
@@ -972,7 +973,6 @@ int attach_mpu401(struct address_info *hw_config, struct module *owner)
        devc->m_busy = 0;
        devc->m_state = ST_INIT;
        devc->shared_irq = hw_config->always_detect;
-       devc->irq = hw_config->irq;
        spin_lock_init(&devc->lock);
 
        if (devc->irq < 0)