diff options
| author | Hans Verkuil | 2013-06-10 12:30:08 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab | 2013-06-21 16:02:55 +0200 |
| commit | 9592bd0a9e74c344f674663137e5ccff7a39f7d0 (patch) | |
| tree | 0f1e77265988af725be1fd4db217d8619c8b8756 /drivers/media/pci/zoran/zoran_card.c | |
| parent | [media] cx23885-417: use v4l2_dev instead of the deprecated parent field (diff) | |
| download | kernel-qcow2-linux-9592bd0a9e74c344f674663137e5ccff7a39f7d0.tar.gz kernel-qcow2-linux-9592bd0a9e74c344f674663137e5ccff7a39f7d0.tar.xz kernel-qcow2-linux-9592bd0a9e74c344f674663137e5ccff7a39f7d0.zip | |
[media] zoran: use v4l2_dev instead of the deprecated parent field
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/pci/zoran/zoran_card.c')
| -rw-r--r-- | drivers/media/pci/zoran/zoran_card.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |