diff options
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-driver.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index a2336915ca70..dcad2f7a995c 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -3207,11 +3207,12 @@ err: | |||
3207 | static int bttv_open(struct file *file) | 3207 | static int bttv_open(struct file *file) |
3208 | { | 3208 | { |
3209 | int minor = video_devdata(file)->minor; | 3209 | int minor = video_devdata(file)->minor; |
3210 | struct video_device *vdev = video_devdata(file); | ||
3210 | struct bttv *btv = video_drvdata(file); | 3211 | struct bttv *btv = video_drvdata(file); |
3211 | struct bttv_fh *fh; | 3212 | struct bttv_fh *fh; |
3212 | enum v4l2_buf_type type = 0; | 3213 | enum v4l2_buf_type type = 0; |
3213 | 3214 | ||
3214 | dprintk(KERN_DEBUG "bttv: open minor=%d\n",minor); | 3215 | dprintk(KERN_DEBUG "bttv: open dev=%s\n", video_device_node_name(vdev)); |
3215 | 3216 | ||
3216 | lock_kernel(); | 3217 | lock_kernel(); |
3217 | if (btv->video_dev->minor == minor) { | 3218 | if (btv->video_dev->minor == minor) { |
@@ -3409,10 +3410,11 @@ static struct video_device bttv_video_template = { | |||
3409 | static int radio_open(struct file *file) | 3410 | static int radio_open(struct file *file) |
3410 | { | 3411 | { |
3411 | int minor = video_devdata(file)->minor; | 3412 | int minor = video_devdata(file)->minor; |
3413 | struct video_device *vdev = video_devdata(file); | ||
3412 | struct bttv *btv = video_drvdata(file); | 3414 | struct bttv *btv = video_drvdata(file); |
3413 | struct bttv_fh *fh; | 3415 | struct bttv_fh *fh; |
3414 | 3416 | ||
3415 | dprintk("bttv: open minor=%d\n",minor); | 3417 | dprintk("bttv: open dev=%s\n", video_device_node_name(vdev)); |
3416 | 3418 | ||
3417 | lock_kernel(); | 3419 | lock_kernel(); |
3418 | WARN_ON(btv->radio_dev && btv->radio_dev->minor != minor); | 3420 | WARN_ON(btv->radio_dev && btv->radio_dev->minor != minor); |