Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[pandora-kernel.git] / drivers / staging / solo6x10 / solo6010-v4l2.c

diff --git a/drivers/staging/solo6x10/solo6010-v4l2.c b/drivers/staging/solo6x10/solo6010-v4l2.c
index 9537cc6..9731fa0 100644 (file)
--- a/drivers/staging/solo6x10/solo6010-v4l2.c
+++ b/drivers/staging/solo6x10/solo6010-v4l2.c
@@ -825,7 +825,7 @@ int solo_v4l2_init(struct solo6010_dev *solo_dev)
        snprintf(solo_dev->vfd->name, sizeof(solo_dev->vfd->name), "%s (%i)",
                 SOLO6010_NAME, solo_dev->vfd->num);
 
-       if (video_nr >= 0)
+       if (video_nr != -1)
                video_nr++;
 
        dev_info(&solo_dev->pdev->dev, "Display as /dev/video%d with "