diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-03-09 13:33:55 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-02 22:34:55 -0300 |
| commit | 635d62f073247e71b51167a01b84f08ff4ca000c (patch) | |
| tree | 9c23e9119ff1e41b7c4580ea6cd0cbdac94a17f2 /drivers/media/pci/ivtv/ivtv-alsa-main.c | |
| parent | b3226f961aa91eb94971939400c7506e7dcc86c0 (diff) | |
| download | op-kernel-dev-635d62f073247e71b51167a01b84f08ff4ca000c.zip op-kernel-dev-635d62f073247e71b51167a01b84f08ff4ca000c.tar.gz | |
[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-alsa-main.c')
| -rw-r--r-- | drivers/media/pci/ivtv/ivtv-alsa-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/ivtv/ivtv-alsa-main.c b/drivers/media/pci/ivtv/ivtv-alsa-main.c index 39b5292..41fa215 100644 --- a/drivers/media/pci/ivtv/ivtv-alsa-main.c +++ b/drivers/media/pci/ivtv/ivtv-alsa-main.c @@ -224,7 +224,7 @@ static int ivtv_alsa_load(struct ivtv *itv) } s = &itv->streams[IVTV_ENC_STREAM_TYPE_PCM]; - if (s->vdev == NULL) { + if (s->vdev.v4l2_dev == NULL) { IVTV_DEBUG_ALSA_INFO("%s: PCM stream for card is disabled - " "skipping\n", __func__); return 0; |
