summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc-v4l.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:40:09 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-08-29 18:40:09 -0300
commit3308516a2fe5ca58a64f65fe813de98f3637d653 (patch)
tree0974c897287c884849110e16586c0f34d8f47957 /linux/drivers/media/video/pwc/pwc-v4l.c
parenta9bf92eb33a4ad79b8093c90379fb9d7519f1c88 (diff)
parente17ae483fc1526567d78cf551747362614aaae95 (diff)
downloadmediapointer-dvb-s2-3308516a2fe5ca58a64f65fe813de98f3637d653.tar.gz
mediapointer-dvb-s2-3308516a2fe5ca58a64f65fe813de98f3637d653.tar.bz2
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-v4l.c')
-rw-r--r--linux/drivers/media/video/pwc/pwc-v4l.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-v4l.c b/linux/drivers/media/video/pwc/pwc-v4l.c
index 174288987..76a1376c9 100644
--- a/linux/drivers/media/video/pwc/pwc-v4l.c
+++ b/linux/drivers/media/video/pwc/pwc-v4l.c
@@ -346,7 +346,7 @@ int pwc_video_do_ioctl(struct inode *inode, struct file *file,
if (vdev == NULL)
return -EFAULT;
- pdev = vdev->priv;
+ pdev = video_get_drvdata(vdev);
if (pdev == NULL)
return -EFAULT;