X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fmedia%2Fvideo%2Fmeye.c;h=0045367a66f1ddb696aeb1083695810d994e1dc3;hb=5e85e732f0ed56aa97a3ba26ac2b93ffe597a208;hp=2fb5854cf6f039d58967b9ad07735c0a73e5f9b3;hpb=f8b71a3a92d69cb1c9c2162f9235d3dd550e4aa0;p=linux-2.6

diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index 2fb5854cf6..0045367a66 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1801,7 +1801,7 @@ static int __devinit meye_probe(struct pci_dev *pcidev,
 	}
 
 	memcpy(meye.video_dev, &meye_template, sizeof(meye_template));
-	meye.video_dev->dev = &meye.mchip_dev->dev;
+	meye.video_dev->parent = &meye.mchip_dev->dev;
 
 	if ((ret = sony_pic_camera_command(SONY_PIC_COMMAND_SETCAMERA, 1))) {
 		printk(KERN_ERR "meye: unable to power on the camera\n");