diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 13:45:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-07 13:45:00 -0700 |
| commit | a4099ae79d04ecf31bd0fc5aa4c1472b6fa7993a (patch) | |
| tree | 54eae861c17389a3fc9383e22b76d43b965e297e /drivers/media/video/mt9m111.c | |
| parent | 5672bc8181b189c05ccc29c692491500682a1b49 (diff) | |
| parent | cc6e853c5e49ea3698e87415672d818c6d7a5ee9 (diff) | |
| download | linux-a4099ae79d04ecf31bd0fc5aa4c1472b6fa7993a.tar.gz linux-a4099ae79d04ecf31bd0fc5aa4c1472b6fa7993a.tar.bz2 linux-a4099ae79d04ecf31bd0fc5aa4c1472b6fa7993a.zip | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (37 commits)
V4L/DVB: v4l: radio: si470x: fix unneeded free_irq() call
V4L/DVB: v4l: videobuf: prevent passing a NULL to dma_free_coherent()
V4L/DVB: ir-core: Fix null dereferences in the protocols sysfs interface
V4L/DVB: v4l: s5p-fimc: Fix 3-planar formats handling and pixel offset error on S5PV210 SoCs
V4L/DVB: v4l: s5p-fimc: Fix return value on probe() failure
V4L/DVB: uvcvideo: Restrict frame rates for Chicony CNF7129 webcam
V4L/DVB: uvcvideo: Fix support for Medion Akoya All-in-one PC integrated webcam
V4L/DVB: ivtvfb: prevent reading uninitialized stack memory
V4L/DVB: cx25840: Fix typo in volume control initialization: 65335 vs. 65535
V4L/DVB: v4l: mem2mem_testdev: add missing release for video_device
V4L/DVB: v4l: mem2mem_testdev: fix errorenous comparison
V4L/DVB: mt9v022.c: Fixed compilation warning
V4L/DVB: mt9m111: added current colorspace at g_fmt
V4L/DVB: mt9m111: cropcap and s_crop check if type is VIDEO_CAPTURE
V4L/DVB: mx2_camera: fix a race causing NULL dereference
V4L/DVB: tm6000: bugfix data handling
V4L/DVB: gspca - sn9c20x: Bad transfer size of Bayer images
V4L/DVB: videobuf-dma-sg: set correct size in last sg element
V4L/DVB: cx231xx: Avoid an OOPS when card is unknown (card=0)
V4L/DVB: dvb: fix smscore_getbuffer() logic
...
Diffstat (limited to 'drivers/media/video/mt9m111.c')
| -rw-r--r-- | drivers/media/video/mt9m111.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/media/video/mt9m111.c b/drivers/media/video/mt9m111.c index 758a4db27d65..c71af4e0e517 100644 --- a/drivers/media/video/mt9m111.c +++ b/drivers/media/video/mt9m111.c @@ -447,6 +447,9 @@ static int mt9m111_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) dev_dbg(&client->dev, "%s left=%d, top=%d, width=%d, height=%d\n", __func__, rect.left, rect.top, rect.width, rect.height); + if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + ret = mt9m111_make_rect(client, &rect); if (!ret) mt9m111->rect = rect; @@ -466,12 +469,14 @@ static int mt9m111_g_crop(struct v4l2_subdev *sd, struct v4l2_crop *a) static int mt9m111_cropcap(struct v4l2_subdev *sd, struct v4l2_cropcap *a) { + if (a->type != V4L2_BUF_TYPE_VIDEO_CAPTURE) + return -EINVAL; + a->bounds.left = MT9M111_MIN_DARK_COLS; a->bounds.top = MT9M111_MIN_DARK_ROWS; a->bounds.width = MT9M111_MAX_WIDTH; a->bounds.height = MT9M111_MAX_HEIGHT; a->defrect = a->bounds; - a->type = V4L2_BUF_TYPE_VIDEO_CAPTURE; a->pixelaspect.numerator = 1; a->pixelaspect.denominator = 1; @@ -487,6 +492,7 @@ static int mt9m111_g_fmt(struct v4l2_subdev *sd, mf->width = mt9m111->rect.width; mf->height = mt9m111->rect.height; mf->code = mt9m111->fmt->code; + mf->colorspace = mt9m111->fmt->colorspace; mf->field = V4L2_FIELD_NONE; return 0; |