Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 219867
b: refs/heads/master
c: 3850a8a
h: refs/heads/master
i:
  219865: 1863e77
  219863: 4272c89
v: v3
  • Loading branch information
Vasiliy Kulikov authored and Greg Kroah-Hartman committed Sep 16, 2010
1 parent 2d835fc commit 739cb23
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 2427924cb02c4886ec298094d18d15eb511ebc14
refs/heads/master: 3850a8ae43a1d93cda1f9a9132d41b98d825f6a3
2 changes: 1 addition & 1 deletion trunk/drivers/staging/solo6x10/solo6010-v4l2-enc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/solo6x10/solo6010-v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 "
Expand Down

0 comments on commit 739cb23

Please sign in to comment.