diff options
| author | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2009-01-17 08:59:31 -0500 |
| commit | c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b (patch) | |
| tree | 4ad3708cf7dc5ff01b2e657e314883ab2330c658 /linux/drivers/media/video/cx23885/cx23885-video.c | |
| parent | 708ba0701edccea0b0fc2b0ea9303337a85ff05c (diff) | |
| parent | b0fc8c78cb5fd9394d8d4ff3198bdc9390b96001 (diff) | |
| download | mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.gz mediapointer-dvb-s2-c6138eadff2f01fd6d20a1f9a39b6ba4cbeff85b.tar.bz2 | |
Merge from master v4l-dvb repo
Diffstat (limited to 'linux/drivers/media/video/cx23885/cx23885-video.c')
| -rw-r--r-- | linux/drivers/media/video/cx23885/cx23885-video.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx23885/cx23885-video.c b/linux/drivers/media/video/cx23885/cx23885-video.c index 838b3ac5a..09291888d 100644 --- a/linux/drivers/media/video/cx23885/cx23885-video.c +++ b/linux/drivers/media/video/cx23885/cx23885-video.c @@ -786,12 +786,13 @@ static int video_open(struct file *file) lock_kernel(); list_for_each(list, &cx23885_devlist) { h = list_entry(list, struct cx23885_dev, devlist); - if (h->video_dev->minor == minor) { + if (h->video_dev && + h->video_dev->minor == minor) { dev = h; type = V4L2_BUF_TYPE_VIDEO_CAPTURE; } if (h->vbi_dev && - h->vbi_dev->minor == minor) { + h->vbi_dev->minor == minor) { dev = h; type = V4L2_BUF_TYPE_VBI_CAPTURE; } |