diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-03-09 17:34:13 +0100 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-03 04:53:34 +0200 |
| commit | 60acf187681aa61f339030540aef74e4d0db875e (patch) | |
| tree | d689f5d0b025be7795bdd5e3a4b0cfd65d378e8a /drivers/media/usb/cx231xx/cx231xx-cards.c | |
| parent | [media] usbvision: embed video_device (diff) | |
| download | linux-60acf187681aa61f339030540aef74e4d0db875e.tar.xz linux-60acf187681aa61f339030540aef74e4d0db875e.zip | |
[media] cx231xx: embed video_device
Embed the video_device struct to simplify the error handling and in
order to (eventually) get rid of video_device_alloc/release.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/usb/cx231xx/cx231xx-cards.c')
| -rw-r--r-- | drivers/media/usb/cx231xx/cx231xx-cards.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c index 85220b97e8b2..fe00da105e77 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -1230,9 +1230,9 @@ static void cx231xx_create_media_graph(struct cx231xx *dev) if (tuner) media_entity_create_link(tuner, 0, decoder, 0, MEDIA_LNK_FL_ENABLED); - media_entity_create_link(decoder, 1, &dev->vdev->entity, 0, + media_entity_create_link(decoder, 1, &dev->vdev.entity, 0, MEDIA_LNK_FL_ENABLED); - media_entity_create_link(decoder, 2, &dev->vbi_dev->entity, 0, + media_entity_create_link(decoder, 2, &dev->vbi_dev.entity, 0, MEDIA_LNK_FL_ENABLED); #endif } @@ -1748,7 +1748,7 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface) if (dev->users) { dev_warn(dev->dev, "device %s is open! Deregistration and memory deallocation are deferred on close.\n", - video_device_node_name(dev->vdev)); + video_device_node_name(&dev->vdev)); /* Even having users, it is safe to remove the RC i2c driver */ cx231xx_ir_exit(dev); |