2 files changed, 6 insertions, 7 deletions
diff --git a/linux/sound/oss/aci.c b/linux/sound/oss/aci.c
index 95405ff3c..49a89e8ed 100644
--- a/linux/sound/oss/aci.c
+++ b/linux/sound/oss/aci.c
@@ -51,7 +51,6 @@
  *   	  Get rid of check_region, .bss optimizations, use set_current_state
  */
 
-#include "compat.h"
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/module.h>
@@ -65,6 +64,7 @@
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
+#include "compat.h"
 #include "sound_config.h"
 
 int aci_port;	/* as determined by bit 4 in the OPTi 929 MC4 register */
diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c
index c0231bcc9..0285a7082 100644
--- a/linux/sound/oss/btaudio.c
+++ b/linux/sound/oss/btaudio.c
@@ -19,7 +19,6 @@
 
 */
 
-#include "compat.h"
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/pci.h>
@@ -41,6 +40,7 @@
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
+#include "compat.h"
 
 
 /* mmio access */
@@ -438,7 +438,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file,
 	return 0;
 }
 
-static struct file_operations btaudio_mixer_fops = {
+static const struct file_operations btaudio_mixer_fops = {
 	.owner		= THIS_MODULE,
 	.llseek		= no_llseek,
 	.open		= btaudio_mixer_open,
@@ -805,7 +805,7 @@ static unsigned int btaudio_dsp_poll(struct file *file, struct poll_table_struct
 	return mask;
 }
 
-static struct file_operations btaudio_digital_dsp_fops = {
+static const struct file_operations btaudio_digital_dsp_fops = {
 	.owner		= THIS_MODULE,
 	.llseek		= no_llseek,
 	.open		= btaudio_dsp_open_digital,
@@ -816,7 +816,7 @@ static struct file_operations btaudio_digital_dsp_fops = {
 	.poll		= btaudio_dsp_poll,
 };
 
-static struct file_operations btaudio_analog_dsp_fops = {
+static const struct file_operations btaudio_analog_dsp_fops = {
 	.owner		= THIS_MODULE,
 	.llseek		= no_llseek,
 	.open		= btaudio_dsp_open_analog,
@@ -928,12 +928,11 @@ static int __devinit btaudio_probe(struct pci_dev *pci_dev,
 		return -EBUSY;
 	}
 
-	bta = kmalloc(sizeof(*bta),GFP_ATOMIC);
+	bta = kzalloc(sizeof(*bta),GFP_ATOMIC);
 	if (!bta) {
 		rc = -ENOMEM;
 		goto fail0;
 	}
-	memset(bta,0,sizeof(*bta));
 
 	bta->pci  = pci_dev;
 	bta->irq  = pci_dev->irq;