---

yaml --- r: 138188 b: refs/heads/master c: b8ced13 h: refs/heads/master v: v3
git-mirror · Mar 30, 2009 · 1e73f69 · 1e73f69
1 parent 4b47f19
commit 1e73f69
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1efd5261ff0b615c482c734e3fb11a75f671d8da
+refs/heads/master: b8ced13462cdb0e407831683b8e2c989b13db3ac
diff --git a/trunk/drivers/media/video/saa7134/saa7134-core.c b/trunk/drivers/media/video/saa7134/saa7134-core.c
@@ -776,7 +776,7 @@ static struct video_device *vdev_init(struct saa7134_dev *dev,
 		return NULL;
 	*vfd = *template;
 	vfd->minor   = -1;
-	vfd->parent  = &dev->pci->dev;
+	vfd->v4l2_dev  = &dev->v4l2_dev;
 	vfd->release = video_device_release;
 	vfd->debug   = video_debug;
 	snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",