aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2009-02-18 11:52:24 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 11:42:56 -0400
commitaff88bca73a16039ed0988660dc7ab755c3e1741 (patch)
tree2efc078a45472df3eec2652cb4f0483e12dcb97c /drivers/media/video
parentdcbd83b1777fa6ed566a8bba035332ed245c0826 (diff)
V4L/DVB (10709): zoran: set correct parent of the video device.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/zoran/zoran_card.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c
index 5d2f090aa0f8..1ad9ed48dbdb 100644
--- a/drivers/media/video/zoran/zoran_card.c
+++ b/drivers/media/video/zoran/zoran_card.c
@@ -1137,6 +1137,7 @@ zr36057_init (struct zoran *zr)
1137 * Now add the template and register the device unit. 1137 * Now add the template and register the device unit.
1138 */ 1138 */
1139 memcpy(zr->video_dev, &zoran_template, sizeof(zoran_template)); 1139 memcpy(zr->video_dev, &zoran_template, sizeof(zoran_template));
1140 zr->video_dev->parent = &zr->pci_dev->dev;
1140 strcpy(zr->video_dev->name, ZR_DEVNAME(zr)); 1141 strcpy(zr->video_dev->name, ZR_DEVNAME(zr));
1141 err = video_register_device(zr->video_dev, VFL_TYPE_GRABBER, video_nr[zr->id]); 1142 err = video_register_device(zr->video_dev, VFL_TYPE_GRABBER, video_nr[zr->id]);
1142 if (err < 0) 1143 if (err < 0)