From: Hans Verkuil Date: Mon, 10 Jun 2013 10:30:08 +0000 (-0300) Subject: [media] zoran: use v4l2_dev instead of the deprecated parent field X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9592bd0a9e74c344f674663137e5ccff7a39f7d0;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [media] zoran: use v4l2_dev instead of the deprecated parent field Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/pci/zoran/zoran_card.c b/drivers/media/pci/zoran/zoran_card.c index bb53d2488ad0..923d59a321f8 100644 --- a/drivers/media/pci/zoran/zoran_card.c +++ b/drivers/media/pci/zoran/zoran_card.c @@ -1050,7 +1050,7 @@ static int 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; + zr->video_dev->v4l2_dev = &zr->v4l2_dev; strcpy(zr->video_dev->name, ZR_DEVNAME(zr)); /* It's not a mem2mem device, but you can both capture and output from one and the same device. This should really be split up into two