summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/ivtv/ivtv-driver.h
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2015-03-09 17:33:55 +0100
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2015-04-03 03:34:55 +0200
commit635d62f073247e71b51167a01b84f08ff4ca000c (patch)
tree9c23e9119ff1e41b7c4580ea6cd0cbdac94a17f2 /drivers/media/pci/ivtv/ivtv-driver.h
parent[media] ts2020: do not use i2c_transfer() on sleep() (diff)
downloadlinux-635d62f073247e71b51167a01b84f08ff4ca000c.tar.xz
linux-635d62f073247e71b51167a01b84f08ff4ca000c.zip
[media] ivtv: 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> Cc: Andy Walls <awalls@md.metrocast.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/ivtv/ivtv-driver.h')
-rw-r--r--drivers/media/pci/ivtv/ivtv-driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-driver.h b/drivers/media/pci/ivtv/ivtv-driver.h
index bc309f42c8ed..e8b6c7ad2ba9 100644
--- a/drivers/media/pci/ivtv/ivtv-driver.h
+++ b/drivers/media/pci/ivtv/ivtv-driver.h
@@ -327,7 +327,7 @@ struct ivtv; /* forward reference */
struct ivtv_stream {
/* These first four fields are always set, even if the stream
is not actually created. */
- struct video_device *vdev; /* NULL when stream not created */
+ struct video_device vdev; /* vdev.v4l2_dev is NULL if there is no device */
struct ivtv *itv; /* for ease of use */
const char *name; /* name of the stream */
int type; /* stream type */