Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164230
b: refs/heads/master
c: 4a5a5b2
h: refs/heads/master
v: v3
  • Loading branch information
Guennadi Liakhovetski authored and Mauro Carvalho Chehab committed Sep 19, 2009
1 parent ed7b8d2 commit 1f58428
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 94896298bea7823cbccbff563c77b4ae6cabb08e
refs/heads/master: 4a5a5b2d620c3ec362936c4fe3799a29f8de163c
6 changes: 4 additions & 2 deletions trunk/drivers/media/video/tw9910.c
Original file line number Diff line number Diff line change
Expand Up @@ -719,9 +719,10 @@ static int tw9910_s_fmt(struct v4l2_subdev *sd, struct v4l2_format *f)
struct i2c_client *client = sd->priv;
struct soc_camera_device *icd = client->dev.platform_data;
struct v4l2_pix_format *pix = &f->fmt.pix;
/* See tw9910_set_crop() - no proper cropping support */
struct v4l2_rect rect = {
.left = icd->rect_current.left,
.top = icd->rect_current.top,
.left = 0,
.top = 0,
.width = pix->width,
.height = pix->height,
};
Expand Down Expand Up @@ -850,6 +851,7 @@ static struct v4l2_subdev_ops tw9910_subdev_ops = {
* i2c_driver function
*/

/* This is called during probe, so, setting rect_max is Ok here: scale == 1 */
static void limit_to_scale(struct soc_camera_device *icd,
const struct tw9910_scale_ctrl *scale)
{
Expand Down

0 comments on commit 1f58428

Please sign in to comment.