From 795652e2cf756c5cfa9b4cecb3f066b8ea01eb08 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 24 Apr 2006 11:26:16 -0300 Subject: Added missing pwc files from previous commit From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/sn9c102/sn9c102.h | 4 ++-- linux/drivers/media/video/sn9c102/sn9c102_core.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'linux/drivers/media/video/sn9c102') diff --git a/linux/drivers/media/video/sn9c102/sn9c102.h b/linux/drivers/media/video/sn9c102/sn9c102.h index 1fcb7e73d..a6a793d35 100644 --- a/linux/drivers/media/video/sn9c102/sn9c102.h +++ b/linux/drivers/media/video/sn9c102/sn9c102.h @@ -36,7 +36,7 @@ #include #if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15) #include -#endif +#endif #include #include @@ -152,7 +152,7 @@ struct sn9c102_device { struct mutex dev_mutex, fileop_mutex; #else struct semaphore dev_mutex, fileop_mutex; -#endif +#endif spinlock_t queue_lock; wait_queue_head_t open, wait_frame, wait_stream; }; diff --git a/linux/drivers/media/video/sn9c102/sn9c102_core.c b/linux/drivers/media/video/sn9c102/sn9c102_core.c index 3add1c79f..20999b5fe 100644 --- a/linux/drivers/media/video/sn9c102/sn9c102_core.c +++ b/linux/drivers/media/video/sn9c102/sn9c102_core.c @@ -1773,7 +1773,7 @@ static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma) unsigned long page = vmalloc_to_pfn(pos); if (remap_pfn_range(vma, start, page, PAGE_SIZE, vma->vm_page_prot)) { -#else +#else if (vm_insert_page(vma, start, vmalloc_to_page(pos))) { #endif mutex_unlock(&cam->fileop_mutex); -- cgit v1.2.3