Merge tag 'devicetree-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / sound / oss / mpu401.c

diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index 25e4609..3bbc3ec 100644 (file)
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -567,7 +567,6 @@ static int mpu401_out(int dev, unsigned char midi_byte)
 static int mpu401_command(int dev, mpu_command_rec * cmd)
 {
        int i, timeout, ok;
-       int ret = 0;
        unsigned long   flags;
        struct mpu_config *devc;
 
@@ -644,7 +643,6 @@ retry:
                        }
                }
        }
-       ret = 0;
        cmd->data[0] = 0;
 
        if (cmd->nr_returns)
@@ -666,7 +664,7 @@ retry:
                }
        }
        spin_unlock_irqrestore(&devc->lock,flags);
-       return ret;
+       return 0;
 }
 
 static int mpu_cmd(int dev, int cmd, int data)