diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-v4l2.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-v4l2.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index f048d80b77e5..43ef7ba75c8b 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
@@ -893,7 +893,7 @@ static int pvr2_v4l2_do_ioctl(struct inode *inode, struct file *file, | |||
893 | 893 | ||
894 | static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) | 894 | static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) |
895 | { | 895 | { |
896 | int minor_id = dip->devbase.minor; | 896 | int num = dip->devbase.num; |
897 | struct pvr2_hdw *hdw = dip->v4lp->channel.mc_head->hdw; | 897 | struct pvr2_hdw *hdw = dip->v4lp->channel.mc_head->hdw; |
898 | enum pvr2_config cfg = dip->config; | 898 | enum pvr2_config cfg = dip->config; |
899 | int v4l_type = dip->v4l_type; | 899 | int v4l_type = dip->v4l_type; |
@@ -909,7 +909,7 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip) | |||
909 | video_unregister_device(&dip->devbase); | 909 | video_unregister_device(&dip->devbase); |
910 | 910 | ||
911 | printk(KERN_INFO "pvrusb2: unregistered device %s%u [%s]\n", | 911 | printk(KERN_INFO "pvrusb2: unregistered device %s%u [%s]\n", |
912 | get_v4l_name(v4l_type),minor_id & 0x1f, | 912 | get_v4l_name(v4l_type), num, |
913 | pvr2_config_get_name(cfg)); | 913 | pvr2_config_get_name(cfg)); |
914 | 914 | ||
915 | } | 915 | } |
@@ -1310,7 +1310,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip, | |||
1310 | } | 1310 | } |
1311 | 1311 | ||
1312 | printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n", | 1312 | printk(KERN_INFO "pvrusb2: registered device %s%u [%s]\n", |
1313 | get_v4l_name(dip->v4l_type),dip->devbase.minor & 0x1f, | 1313 | get_v4l_name(dip->v4l_type), dip->devbase.num, |
1314 | pvr2_config_get_name(dip->config)); | 1314 | pvr2_config_get_name(dip->config)); |
1315 | 1315 | ||
1316 | pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw, | 1316 | pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw, |