diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2013-06-20 15:57:10 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2013-06-21 16:05:29 +0200 |
| commit | d481c581dfe43be11a17728b5c84c2d4b5beecb2 (patch) | |
| tree | b72cc7c3f4d7ae7ef4f7e95cff39819dd453e291 /drivers/media/pci | |
| parent | [media] omap24xxcam: add v4l2_device and replace parent with v4l2_dev (diff) | |
| download | linux-d481c581dfe43be11a17728b5c84c2d4b5beecb2.tar.xz linux-d481c581dfe43be11a17728b5c84c2d4b5beecb2.zip | |
[media] saa7134: 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')
| -rw-r--r-- | drivers/media/pci/saa7134/saa7134-empress.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-empress.c b/drivers/media/pci/saa7134/saa7134-empress.c index e66bc3d969cf..3022eb2a7925 100644 --- a/drivers/media/pci/saa7134/saa7134-empress.c +++ b/drivers/media/pci/saa7134/saa7134-empress.c @@ -511,7 +511,7 @@ static int empress_init(struct saa7134_dev *dev) if (NULL == dev->empress_dev) return -ENOMEM; *(dev->empress_dev) = saa7134_empress_template; - dev->empress_dev->parent = &dev->pci->dev; + dev->empress_dev->v4l2_dev = &dev->v4l2_dev; dev->empress_dev->release = video_device_release; snprintf(dev->empress_dev->name, sizeof(dev->empress_dev->name), "%s empress (%s)", dev->name, |