aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDevin Heitmueller <dheitmueller@kernellabs.com>2009-12-20 21:15:58 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-02-26 13:10:44 -0500
commit780edb7ad60e5c657770f510747cc609c84b5b61 (patch)
tree601f7f5cff9ac0dba1f549d732b836c360e793ba /drivers
parent4dae2f0f84374d4e7cd6c8d41385a7c250f0726d (diff)
V4L/DVB: cx18-alsa: codingstyle fixes
Fix codingstyle issues, and make the minimum version for cx18-alsa required to be 2.6.17, so that we don't need all the #ifdefs related to the changes to ALSA structures. This work was sponsored by ONELAN Limited. Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/cx18/cx18-alsa-pcm.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/cx18/cx18-alsa-pcm.c b/drivers/media/video/cx18/cx18-alsa-pcm.c
index e14f8e42a2ab..371dfb8d8756 100644
--- a/drivers/media/video/cx18/cx18-alsa-pcm.c
+++ b/drivers/media/video/cx18/cx18-alsa-pcm.c
@@ -85,9 +85,9 @@ static int snd_cx18_pcm_capture_open(struct snd_pcm_substream *substream)
85 85
86 /* Allocate memory */ 86 /* Allocate memory */
87 item = kmalloc(sizeof(struct cx18_open_id), GFP_KERNEL); 87 item = kmalloc(sizeof(struct cx18_open_id), GFP_KERNEL);
88 if (NULL == item) { 88 if (NULL == item)
89 return -ENOMEM; 89 return -ENOMEM;
90 } 90
91 item->cx = cx; 91 item->cx = cx;
92 item->type = s->type; 92 item->type = s->type;
93 item->open_id = cx->open_id++; 93 item->open_id = cx->open_id++;
@@ -223,7 +223,6 @@ snd_pcm_uframes_t snd_cx18_pcm_pointer(struct snd_pcm_substream *substream)
223 return hwptr_done; 223 return hwptr_done;
224} 224}
225 225
226
227static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs, 226static struct page *snd_pcm_get_vmalloc_page(struct snd_pcm_substream *subs,
228 unsigned long offset) 227 unsigned long offset)
229{ 228{
@@ -341,7 +340,8 @@ int snd_cx18_pcm_create(struct snd_cx18_card *cxsc)
341 340
342 spin_lock_init(&cxsc->slock); 341 spin_lock_init(&cxsc->slock);
343 342
344 snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE, &snd_cx18_pcm_capture_ops); 343 snd_pcm_set_ops(sp, SNDRV_PCM_STREAM_CAPTURE,
344 &snd_cx18_pcm_capture_ops);
345 sp->info_flags = 0; 345 sp->info_flags = 0;
346 sp->private_data = cxsc; 346 sp->private_data = cxsc;
347 strlcpy(sp->name, cx->card_name, sizeof(sp->name)); 347 strlcpy(sp->name, cx->card_name, sizeof(sp->name));