From fb9d6aa795d484c9d642fa6a0fc4c8a0b756e0a7 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Sun, 20 Dec 2009 23:15:58 -0300 Subject: [PATCH] --- yaml --- r: 181565 b: refs/heads/master c: 780edb7ad60e5c657770f510747cc609c84b5b61 h: refs/heads/master i: 181563: 970e1381a5a2f8754c0f0a29dc0e083d203597a1 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx18/cx18-alsa-pcm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index ae87c56b1744..c2c3c7dd4908 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4dae2f0f84374d4e7cd6c8d41385a7c250f0726d +refs/heads/master: 780edb7ad60e5c657770f510747cc609c84b5b61 diff --git a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c index e14f8e42a2ab..371dfb8d8756 100644 --- a/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c +++ b/trunk/drivers/media/video/cx18/cx18-alsa-pcm.c @@ -85,9 +85,9 @@ static int snd_cx18_pcm_capture_open(struct snd_pcm_substream *substream) /* Allocate memory */ item = kmalloc(sizeof(struct cx18_open_id), GFP_KERNEL); - if (NULL == item) { + if (NULL == item) return -ENOMEM; - } + item->cx = cx; item->type = s->type; item->open_id = cx->open_id++; @@ -223,7 +223,6 @@ snd_pcm_uframes_t snd_cx18_pcm_pointer(struct snd_pcm_substream *substream) return hwptr_done; } - static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs, unsigned long offset) { @@ -341,7 +340,8 @@ int snd_cx18_pcm_create(struct snd_cx18_card *cxsc) spin_lock_init(&cxsc->slock); - snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE, &snd_cx18_pcm_capture_ops); + snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE, + &snd_cx18_pcm_capture_ops); sp->info_flags = 0; sp->private_data = cxsc; strlcpy(sp->name, cx->card_name, sizeof(sp->name));