diff options
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-driver.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 63e83162286c..6db5e4e73397 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -3909,8 +3909,6 @@ static void bttv_unregister_video(struct bttv *btv) | |||
3909 | /* register video4linux devices */ | 3909 | /* register video4linux devices */ |
3910 | static int __devinit bttv_register_video(struct bttv *btv) | 3910 | static int __devinit bttv_register_video(struct bttv *btv) |
3911 | { | 3911 | { |
3912 | int ret; | ||
3913 | |||
3914 | if (no_overlay <= 0) { | 3912 | if (no_overlay <= 0) { |
3915 | bttv_video_template.type |= VID_TYPE_OVERLAY; | 3913 | bttv_video_template.type |= VID_TYPE_OVERLAY; |
3916 | } else { | 3914 | } else { |
@@ -3925,10 +3923,8 @@ static int __devinit bttv_register_video(struct bttv *btv) | |||
3925 | goto err; | 3923 | goto err; |
3926 | printk(KERN_INFO "bttv%d: registered device video%d\n", | 3924 | printk(KERN_INFO "bttv%d: registered device video%d\n", |
3927 | btv->c.nr,btv->video_dev->minor & 0x1f); | 3925 | btv->c.nr,btv->video_dev->minor & 0x1f); |
3928 | ret = video_device_create_file(btv->video_dev, &class_device_attr_card); | 3926 | |
3929 | if (ret < 0) | 3927 | video_device_create_file(btv->video_dev, &class_device_attr_card); |
3930 | printk(KERN_WARNING "bttv: video_device_create_file error: " | ||
3931 | "%d\n", ret); | ||
3932 | 3928 | ||
3933 | /* vbi */ | 3929 | /* vbi */ |
3934 | btv->vbi_dev = vdev_init(btv, &bttv_vbi_template, "vbi"); | 3930 | btv->vbi_dev = vdev_init(btv, &bttv_vbi_template, "vbi"); |