summaryrefslogtreecommitdiff
path: root/linux
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-04-19 06:40:35 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-19 06:40:35 -0300
commitfafa73afff3347cd279b9db9f82bf9e8f2751401 (patch)
treed75519f7223214a94a052c4a9a72d9174312ad22 /linux
parentc2bb2a91e6474f1314efb165ef91ae88953b5a84 (diff)
parent7309759ea33b77fc45c171a3cc78c501ed758bb8 (diff)
downloadmediapointer-dvb-s2-fafa73afff3347cd279b9db9f82bf9e8f2751401.tar.gz
mediapointer-dvb-s2-fafa73afff3347cd279b9db9f82bf9e8f2751401.tar.bz2
merge: http://www.linuxtv.org/hg/~stoth/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
-rw-r--r--linux/drivers/media/video/ov511.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ov511.c b/linux/drivers/media/video/ov511.c
index cba851d18..4c8050667 100644
--- a/linux/drivers/media/video/ov511.c
+++ b/linux/drivers/media/video/ov511.c
@@ -5838,7 +5838,7 @@ ov51x_probe(struct usb_interface *intf, const struct usb_device_id *id)
goto error;
memcpy(ov->vdev, &vdev_template, sizeof(*ov->vdev));
- ov->vdev->dev = &dev->dev;
+ ov->vdev->dev = &intf->dev;
video_set_drvdata(ov->vdev, ov);
for (i = 0; i < OV511_MAX_UNIT_VIDEO; i++) {