diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 12:47:08 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-02-21 12:47:08 -0200 |
| commit | b53eb55ff0f73052682018efc8974bcbc7f6aec1 (patch) | |
| tree | b7d9428d1526391f5b7a68cb42282a855f12a7c3 /linux/sound/oss | |
| parent | 137bc05fa17aaf28ca2de6ecbf7231920fcc4176 (diff) | |
| download | mediapointer-dvb-s2-b53eb55ff0f73052682018efc8974bcbc7f6aec1.tar.gz mediapointer-dvb-s2-b53eb55ff0f73052682018efc8974bcbc7f6aec1.tar.bz2 | |
Updates i2c-id.h and btaudio.c
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync: those files are maintained by i2c and alsa guys
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/sound/oss')
| -rw-r--r-- | linux/sound/oss/btaudio.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c index c0231bcc9..9a55ff5d0 100644 --- a/linux/sound/oss/btaudio.c +++ b/linux/sound/oss/btaudio.c @@ -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; |