diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2015-03-09 13:34:03 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-04-03 00:05:36 -0300 |
| commit | 08569d6477d76e2fc8fdd41cfb0ce02f59333c69 (patch) | |
| tree | ec115d8b99b8f2b3cf632cd8b74b29acc204fed3 /drivers/media/pci/cx18/cx18-alsa-main.c | |
| parent | 38a1421ddd68edecb53e6dd16bae3a4b089fa1cf (diff) | |
[media] cx18: 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/cx18/cx18-alsa-main.c')
| -rw-r--r-- | drivers/media/pci/cx18/cx18-alsa-main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx18/cx18-alsa-main.c b/drivers/media/pci/cx18/cx18-alsa-main.c index ea272bcb38df..0b0e8015ad34 100644 --- a/drivers/media/pci/cx18/cx18-alsa-main.c +++ b/drivers/media/pci/cx18/cx18-alsa-main.c @@ -216,7 +216,7 @@ static int cx18_alsa_load(struct cx18 *cx) } s = &cx->streams[CX18_ENC_STREAM_TYPE_PCM]; - if (s->video_dev == NULL) { + if (s->video_dev.v4l2_dev == NULL) { CX18_DEBUG_ALSA_INFO("%s: PCM stream for card is disabled - " "skipping\n", __func__); return 0; |