diff --git a/[refs] b/[refs] index c84bc4898e96..7ba4f40a989f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f2e6c6ad0207f22b55bb45a6b0958cecde3db8f1 +refs/heads/master: 7de0b8739f9b7856d2c3aa96e50e851283eeb24a diff --git a/trunk/drivers/media/video/vivi.c b/trunk/drivers/media/video/vivi.c index 37632a064966..cdbe70385c12 100644 --- a/trunk/drivers/media/video/vivi.c +++ b/trunk/drivers/media/video/vivi.c @@ -1371,7 +1371,7 @@ static int __init vivi_create_instance(int inst) /* Now that everything is fine, let's add it to device list */ list_add_tail(&dev->vivi_devlist, &vivi_devlist); - if (video_nr >= 0) + if (video_nr != -1) video_nr++; dev->vfd = vfd;