diff --git a/[refs] b/[refs]
index 73255e23f2b2..de81532d730d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcbd83b1777fa6ed566a8bba035332ed245c0826
+refs/heads/master: aff88bca73a16039ed0988660dc7ab755c3e1741
diff --git a/trunk/drivers/media/video/zoran/zoran_card.c b/trunk/drivers/media/video/zoran/zoran_card.c
index 5d2f090aa0f8..1ad9ed48dbdb 100644
--- a/trunk/drivers/media/video/zoran/zoran_card.c
+++ b/trunk/drivers/media/video/zoran/zoran_card.c
@@ -1137,6 +1137,7 @@ zr36057_init (struct zoran *zr)
 	 *   Now add the template and register the device unit.
 	 */
 	memcpy(zr->video_dev, &zoran_template, sizeof(zoran_template));
+	zr->video_dev->parent = &zr->pci_dev->dev;
 	strcpy(zr->video_dev->name, ZR_DEVNAME(zr));
 	err = video_register_device(zr->video_dev, VFL_TYPE_GRABBER, video_nr[zr->id]);
 	if (err < 0)