Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 193120
b: refs/heads/master
c: 7e87ddb
h: refs/heads/master
v: v3
  • Loading branch information
Hans Verkuil authored and Mauro Carvalho Chehab committed May 19, 2010
1 parent b5ab52f commit ba88675
Show file tree
Hide file tree
Showing 2 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: 09419af39b510851ed14319a93b6d214b80025db
refs/heads/master: 7e87ddb101caa747edf388220c758c99553566f5
4 changes: 2 additions & 2 deletions trunk/drivers/media/video/cx231xx/cx231xx-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -1669,7 +1669,7 @@ static int vidioc_g_fmt_sliced_vbi_cap(struct file *file, void *priv,

f->fmt.sliced.service_set = 0;

call_all(dev, video, g_fmt, f);
call_all(dev, vbi, g_sliced_fmt, &f->fmt.sliced);

if (f->fmt.sliced.service_set == 0)
rc = -EINVAL;
Expand All @@ -1690,7 +1690,7 @@ static int vidioc_try_set_sliced_vbi_cap(struct file *file, void *priv,
return rc;

mutex_lock(&dev->lock);
call_all(dev, video, g_fmt, f);
call_all(dev, vbi, g_sliced_fmt, &f->fmt.sliced);
mutex_unlock(&dev->lock);

if (f->fmt.sliced.service_set == 0)
Expand Down

0 comments on commit ba88675

Please sign in to comment.