]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sound/oss: fix sparse warning: symbol shadows an earlier one
authorHannes Eder <hannes@hanneseder.net>
Wed, 25 Feb 2009 21:29:47 +0000 (22:29 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 26 Feb 2009 08:55:30 +0000 (09:55 +0100)
Impact: Move variable to a more inner scope.

Fix this sparse warning:
  sound/oss/sequencer.c:235:29: warning: symbol 'err' shadows an earlier one
  sound/oss/sequencer.c:215:13: originally declared here

Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/oss/sequencer.c

index 5c215f787ca9340e5cb2ad33da47c9658bb2dfcc..c79874696becfdf81c4f42793ff44eee35bd103e 100644 (file)
@@ -212,7 +212,6 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
 {
        unsigned char event_rec[EV_SZ], ev_code;
        int p = 0, c, ev_size;
-       int err;
        int mode = translate_mode(file);
 
        dev = dev >> 4;
@@ -285,7 +284,7 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
                {
                        if (!midi_opened[event_rec[2]])
                        {
-                               int mode;
+                               int err, mode;
                                int dev = event_rec[2];
 
                                if (dev >= max_mididev || midi_devs[dev]==NULL)