Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 242106
b: refs/heads/master
c: a07500e
h: refs/heads/master
v: v3
  • Loading branch information
Alexander Strakh authored and Mauro Carvalho Chehab committed Mar 22, 2011
1 parent 6cc2a8d commit 09bf39d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 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: 868e90d55c0eb6f3c5949c2a747714072c3e080a
refs/heads/master: a07500ef690fcbec76e879ee2093d7ca69883825
4 changes: 1 addition & 3 deletions trunk/drivers/media/video/tlg2300/pd-video.c
Original file line number Diff line number Diff line change
Expand Up @@ -764,10 +764,8 @@ static int pd_vidioc_s_fmt(struct poseidon *pd, struct v4l2_pix_format *pix)
}
ret |= send_set_req(pd, VIDEO_ROSOLU_SEL,
vid_resol, &cmd_status);
if (ret || cmd_status) {
mutex_unlock(&pd->lock);
if (ret || cmd_status)
return -EBUSY;
}

pix_def->pixelformat = pix->pixelformat; /* save it */
pix->height = (context->tvnormid & V4L2_STD_525_60) ? 480 : 576;
Expand Down

0 comments on commit 09bf39d

Please sign in to comment.