diff --git a/drivers/media/usb/hdpvr/hdpvr-core.c b/drivers/media/usb/hdpvr/hdpvr-core.c
index 29ac7fc5b039..640ef83b57c9 100644
--- a/drivers/media/usb/hdpvr/hdpvr-core.c
+++ b/drivers/media/usb/hdpvr/hdpvr-core.c
@@ -275,6 +275,7 @@ static int hdpvr_probe(struct usb_interface *interface,
 #endif
        size_t buffer_size;
        int i;
+       int dev_num;
        int retval = -ENOMEM;
 
        /* allocate memory for our device state and initialize it */
@@ -371,9 +372,18 @@ static int hdpvr_probe(struct usb_interface *interface,
                goto reg_fail;
        }
 #endif
-
+       
+       dev_num = atomic_inc_return(&dev_nr); 
+       if (dev_num >= HDPVR_MAX) {
+               v4l2_err(&dev->v4l2_dev, 
+                       "max device number reached, device register failed\n");
+               atomic_dec(&dev_nr);
+               retval = -ENODEV;
+               goto reg_fail;
+       }
+               
        retval = hdpvr_register_videodev(dev, &interface->dev,
-                                   video_nr[atomic_inc_return(&dev_nr)]);
+                                   video_nr[dev_num]);
        if (retval < 0) {
                v4l2_err(&dev->v4l2_dev, "registering videodev failed\n");
                goto reg_fail;