1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
index 6cf17080eb49..02a541fbeff9 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c
@@ -722,7 +722,12 @@ static void pvr2_v4l2_dev_destroy(struct pvr2_v4l2_dev *dip)
 
 static void pvr2_v4l2_destroy_no_lock(struct pvr2_v4l2 *vp)
 {
-        pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,-1);
+        pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,
+                                        pvr2_config_mpeg-1,-1);
+        pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,
+                                        pvr2_config_vbi-1,-1);
+        pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,
+                                        pvr2_config_radio-1,-1);
         pvr2_v4l2_dev_destroy(vp->vdev);
 
         pvr2_trace(PVR2_TRACE_STRUCT,"Destroying pvr2_v4l2 id=%p",vp);
@@ -1062,7 +1067,7 @@ static void pvr2_v4l2_dev_init(struct pvr2_v4l2_dev *dip,
         }
 
         pvr2_hdw_v4l_store_minor_number(vp->channel.mc_head->hdw,
-                                        dip->devbase.minor);
+                                        cfg-1,dip->devbase.minor);
 }