From 739cb236d85bc5cd22b389ddeddcd21681d8f105 Mon Sep 17 00:00:00 2001 From: Vasiliy Kulikov Date: Sun, 12 Sep 2010 22:56:57 +0400 Subject: [PATCH] --- yaml --- r: 219867 b: refs/heads/master c: 3850a8ae43a1d93cda1f9a9132d41b98d825f6a3 h: refs/heads/master i: 219865: 1863e77fcbb46dc384ebca5f4e12c949b4c84bba 219863: 4272c892aaf1de3e49fdeec5451c112dfb22a2e8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c | 2 +- trunk/drivers/staging/solo6x10/solo6010-v4l2.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index edc53354eb24..11f42dbdf920 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2427924cb02c4886ec298094d18d15eb511ebc14 +refs/heads/master: 3850a8ae43a1d93cda1f9a9132d41b98d825f6a3 diff --git a/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c b/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c index f114b4b7d8ee..bbf3d9c4abb0 100644 --- a/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c +++ b/trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c @@ -1497,7 +1497,7 @@ static struct solo_enc_dev *solo_enc_alloc(struct solo6010_dev *solo_dev, u8 ch) "%s-enc (%i/%i)", SOLO6010_NAME, solo_dev->vfd->num, solo_enc->vfd->num); - if (video_nr >= 0) + if (video_nr != -1) video_nr++; spin_lock_init(&solo_enc->lock); diff --git a/trunk/drivers/staging/solo6x10/solo6010-v4l2.c b/trunk/drivers/staging/solo6x10/solo6010-v4l2.c index 9537cc6ee3b7..9731fa02b5e8 100644 --- a/trunk/drivers/staging/solo6x10/solo6010-v4l2.c +++ b/trunk/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 "