diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-24 09:05:23 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-24 09:05:23 -0200 |
| commit | c1ad9834d2d8678d26d3ce2a6cf39038345c33f7 (patch) | |
| tree | 4f0ef2cd6728a226c78d62abf7c463ffd3a3d403 /linux/sound/oss/btaudio.c | |
| parent | 9047bbc89eed91f91b8e0e7b3341bf696515889a (diff) | |
| parent | 0c10299d80fe45160d3c79fd58634ae3b1c025db (diff) | |
| download | mediapointer-dvb-s2-c1ad9834d2d8678d26d3ce2a6cf39038345c33f7.tar.gz mediapointer-dvb-s2-c1ad9834d2d8678d26d3ce2a6cf39038345c33f7.tar.bz2 | |
merge: http://linuxtv.org/hg/~hhackmann/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound/oss/btaudio.c')
| -rw-r--r-- | linux/sound/oss/btaudio.c | 11 |
1 files changed, 5 insertions, 6 deletions
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; |