diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-10 06:30:08 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-21 10:02:55 -0400 |
| commit | 9592bd0a9e74c344f674663137e5ccff7a39f7d0 (patch) | |
| tree | 0f1e77265988af725be1fd4db217d8619c8b8756 | |
| parent | 874d91db7840d405d62450ac9b65867494ef7179 (diff) | |
[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>
| -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) | |||
| 1050 | * Now add the template and register the device unit. | 1050 | * Now add the template and register the device unit. |
| 1051 | */ | 1051 | */ |
| 1052 | memcpy(zr->video_dev, &zoran_template, sizeof(zoran_template)); | 1052 | memcpy(zr->video_dev, &zoran_template, sizeof(zoran_template)); |
| 1053 | zr->video_dev->parent = &zr->pci_dev->dev; | 1053 | zr->video_dev->v4l2_dev = &zr->v4l2_dev; |
| 1054 | strcpy(zr->video_dev->name, ZR_DEVNAME(zr)); | 1054 | strcpy(zr->video_dev->name, ZR_DEVNAME(zr)); |
| 1055 | /* It's not a mem2mem device, but you can both capture and output from | 1055 | /* It's not a mem2mem device, but you can both capture and output from |
| 1056 | one and the same device. This should really be split up into two | 1056 | one and the same device. This should really be split up into two |