diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 16:35:29 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 16:35:29 +0200 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /drivers/media/video/mt9t112.c | |
| parent | arch/tile: Do not use GFP_KERNEL for dma_alloc_coherent(). (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir... (diff) | |
| download | linux-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.tar.xz linux-cc44826a26b12b2489bc7dbb597fcdf107f2cc01.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/media/video/mt9t112.c')
| -rw-r--r-- | drivers/media/video/mt9t112.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c index aa4fce95098f..e4bf1db9a87b 100644 --- a/drivers/media/video/mt9t112.c +++ b/drivers/media/video/mt9t112.c @@ -1017,10 +1017,10 @@ static int mt9t112_try_fmt(struct v4l2_subdev *sd, return 0; } -static int mt9t112_enum_fmt(struct v4l2_subdev *sd, int index, +static int mt9t112_enum_fmt(struct v4l2_subdev *sd, unsigned int index, enum v4l2_mbus_pixelcode *code) { - if ((unsigned int)index >= ARRAY_SIZE(mt9t112_cfmts)) + if (index >= ARRAY_SIZE(mt9t112_cfmts)) return -EINVAL; *code = mt9t112_cfmts[index].code; |