Merge branch 'for-2.6.34' of git://linux-nfs.org/~bfields/linux

[mv-sheeva.git] / drivers / media / video / cpia.c

diff --git a/drivers/media/video/cpia.c b/drivers/media/video/cpia.c
index 551ddf216a4bb21d51b9c6425a992946594d0e0f..933ae4c8cb9a6467b63f2d576e2b008b86c95ae8 100644 (file)
--- a/drivers/media/video/cpia.c
+++ b/drivers/media/video/cpia.c
@@ -3737,9 +3737,6 @@ static int cpia_mmap(struct file *file, struct vm_area_struct *vma)
        if (size > FRAME_NUM*CPIA_MAX_FRAME_SIZE)
                return -EINVAL;
 
-       if (!cam || !cam->ops)
-               return -ENODEV;
-
        /* make this _really_ smp-safe */
        if (mutex_lock_interruptible(&cam->busy_lock))
                return -EINTR;