9 files changed, 11 insertions, 11 deletions

diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig
index 135a2b77cc4a..a513651fa149 100644
--- a/sound/oss/Kconfig
+++ b/sound/oss/Kconfig
@@ -1,5 +1,3 @@
-# drivers/sound/Config.in
-#
 # 18 Apr 1998, Michael Elizabeth Chastain, <mailto:mec@shout.net>
 # More hacking for modularisation.
 #
diff --git a/sound/oss/audio.c b/sound/oss/audio.c
index b69c05b7ea7b..7df48a25c4ee 100644
--- a/sound/oss/audio.c
+++ b/sound/oss/audio.c
@@ -838,7 +838,7 @@ static int dma_ioctl(int dev, unsigned int cmd, void __user *arg)
                                         if ((err = audio_devs[dev]->d->prepare_for_input(dev,
                                                      dmap_in->fragment_size, dmap_in->nbufs)) < 0) {
                                                 spin_unlock_irqrestore(&dmap_in->lock,flags);
-                                                return -err;
+                                                return err;
                                         }
                                         dmap_in->dma_mode = DMODE_INPUT;
                                         audio_devs[dev]->enable_bits |= PCM_ENABLE_INPUT;
diff --git a/sound/oss/dmasound/dmasound_core.c b/sound/oss/dmasound/dmasound_core.c
index 793b7f478433..3f3c3f71db4b 100644
--- a/sound/oss/dmasound/dmasound_core.c
+++ b/sound/oss/dmasound/dmasound_core.c
@@ -219,7 +219,9 @@ static int shared_resources_initialised;
      *  Mid level stuff
      */
 
-struct sound_settings dmasound = { .lock = SPIN_LOCK_UNLOCKED };
+struct sound_settings dmasound = {
+        .lock = __SPIN_LOCK_UNLOCKED(dmasound.lock)
+};
 
 static inline void sound_silence(void)
 {
diff --git a/sound/oss/dmasound/dmasound_paula.c b/sound/oss/dmasound/dmasound_paula.c
index 06e9e88e4c05..bb14e4c67e89 100644
--- a/sound/oss/dmasound/dmasound_paula.c
+++ b/sound/oss/dmasound/dmasound_paula.c
@@ -657,7 +657,7 @@ static int AmiStateInfo(char *buffer, size_t space)
         len += sprintf(buffer+len, "\tsound.volume_right = %d [0...64]\n",
                        dmasound.volume_right);
         if (len >= space) {
-                printk(KERN_ERR "dmasound_paula: overlowed state buffer alloc.\n") ;
+                printk(KERN_ERR "dmasound_paula: overflowed state buffer alloc.\n") ;
                 len = space ;
         }
         return len;
diff --git a/sound/oss/hex2hex.c b/sound/oss/hex2hex.c
index 5460faae98c9..041ef5c52bc2 100644
--- a/sound/oss/hex2hex.c
+++ b/sound/oss/hex2hex.c
@@ -12,7 +12,7 @@
 #define MAX_SIZE (256*1024)
 unsigned char buf[MAX_SIZE];
 
-int loadhex(FILE *inf, unsigned char *buf)
+static int loadhex(FILE *inf, unsigned char *buf)
 {
         int l=0, c, i;
 
diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c
index 9e450988ed36..3bc7104c5379 100644
--- a/sound/oss/midi_synth.c
+++ b/sound/oss/midi_synth.c
@@ -426,7 +426,7 @@ midi_synth_open(int dev, int mode)
         int             err;
         struct midi_input_info *inc;
 
-        if (orig_dev < 0 || orig_dev > num_midis || midi_devs[orig_dev] == NULL)
+        if (orig_dev < 0 || orig_dev >= num_midis || midi_devs[orig_dev] == NULL)
                 return -ENXIO;
 
         midi2synth[orig_dev] = dev;
diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c
index 734b8f9e2f78..0af9d24feb8f 100644
--- a/sound/oss/mpu401.c
+++ b/sound/oss/mpu401.c
@@ -770,7 +770,7 @@ static int mpu_synth_ioctl(int dev, unsigned int cmd, void __user *arg)
 
         midi_dev = synth_devs[dev]->midi_dev;
 
-        if (midi_dev < 0 || midi_dev > num_midis || midi_devs[midi_dev] == NULL)
+        if (midi_dev < 0 || midi_dev >= num_midis || midi_devs[midi_dev] == NULL)
                 return -ENXIO;
 
         devc = &dev_conf[midi_dev];
diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c
index 77d0e5efda76..ce4db49291f7 100644
--- a/sound/oss/sb_common.c
+++ b/sound/oss/sb_common.c
@@ -157,7 +157,7 @@ static void sb_intr (sb_devc *devc)
                                 break;
 
                         default:
-                                /* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
+                                /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
                                 ;
                 }
         }
@@ -177,7 +177,7 @@ static void sb_intr (sb_devc *devc)
                                 break;
 
                         default:
-                                /* printk(KERN_WARN "Sound Blaster: Unexpected interrupt\n"); */
+                                /* printk(KERN_WARNING "Sound Blaster: Unexpected interrupt\n"); */
                                 ;
                 }
         }
diff --git a/sound/oss/sb_ess.c b/sound/oss/sb_ess.c
index 180e95c87e3e..51a3d381a59e 100644
--- a/sound/oss/sb_ess.c
+++ b/sound/oss/sb_ess.c
@@ -782,7 +782,7 @@ printk(KERN_INFO "FKS: ess_handle_channel %s irq_mode=%d\n", channel, irq_mode);
                         break;
 
                 default:;
-                        /* printk(KERN_WARN "ESS: Unexpected interrupt\n"); */
+                        /* printk(KERN_WARNING "ESS: Unexpected interrupt\n"); */
         }
 }