diff options
Diffstat (limited to 'drivers/media/video/cx88/cx88-alsa.c')
-rw-r--r-- | drivers/media/video/cx88/cx88-alsa.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index e4355fdc3b6d..3956c257556c 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
@@ -232,7 +232,8 @@ static void cx8801_aud_irq(snd_cx88_card_t *chip) | |||
232 | cx_write(MO_AUD_INTSTAT, status); | 232 | cx_write(MO_AUD_INTSTAT, status); |
233 | if (debug > 1 || (status & mask & ~0xff)) | 233 | if (debug > 1 || (status & mask & ~0xff)) |
234 | cx88_print_irqbits(core->name, "irq aud", | 234 | cx88_print_irqbits(core->name, "irq aud", |
235 | cx88_aud_irqs, status, mask); | 235 | cx88_aud_irqs, ARRAY_SIZE(cx88_aud_irqs), |
236 | status, mask); | ||
236 | /* risc op code error */ | 237 | /* risc op code error */ |
237 | if (status & (1 << 16)) { | 238 | if (status & (1 << 16)) { |
238 | printk(KERN_WARNING "%s/0: audio risc op code error\n",core->name); | 239 | printk(KERN_WARNING "%s/0: audio risc op code error\n",core->name); |
@@ -413,11 +414,9 @@ static int snd_cx88_hw_params(struct snd_pcm_substream * substream, | |||
413 | 414 | ||
414 | dprintk(1,"Setting buffer\n"); | 415 | dprintk(1,"Setting buffer\n"); |
415 | 416 | ||
416 | buf = kmalloc(sizeof(*buf),GFP_KERNEL); | 417 | buf = kzalloc(sizeof(*buf),GFP_KERNEL); |
417 | if (NULL == buf) | 418 | if (NULL == buf) |
418 | return -ENOMEM; | 419 | return -ENOMEM; |
419 | memset(buf,0,sizeof(*buf)); | ||
420 | |||
421 | 420 | ||
422 | buf->vb.memory = V4L2_MEMORY_MMAP; | 421 | buf->vb.memory = V4L2_MEMORY_MMAP; |
423 | buf->vb.width = chip->period_size; | 422 | buf->vb.width = chip->period_size; |
@@ -682,7 +681,7 @@ static int __devinit snd_cx88_create(struct snd_card *card, | |||
682 | return err; | 681 | return err; |
683 | } | 682 | } |
684 | 683 | ||
685 | if (!pci_dma_supported(pci,0xffffffff)) { | 684 | if (!pci_dma_supported(pci,DMA_32BIT_MASK)) { |
686 | dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name); | 685 | dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name); |
687 | err = -EIO; | 686 | err = -EIO; |
688 | cx88_core_put(core,pci); | 687 | cx88_core_put(core,pci); |