diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-06-05 10:35:29 -0400 |
| commit | cc44826a26b12b2489bc7dbb597fcdf107f2cc01 (patch) | |
| tree | 98a7958212ac61345300944f512a949e5ee3e513 /drivers/media/video/mt9m001.c | |
| parent | 482e6f8466ab1066f1a969bcdbe916b56439622c (diff) | |
| parent | 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/media/video/mt9m001.c')
| -rw-r--r-- | drivers/media/video/mt9m001.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/mt9m001.c b/drivers/media/video/mt9m001.c index e3b9a8ab37f4..79f096ddcf5d 100644 --- a/drivers/media/video/mt9m001.c +++ b/drivers/media/video/mt9m001.c | |||
| @@ -701,13 +701,13 @@ static struct v4l2_subdev_core_ops mt9m001_subdev_core_ops = { | |||
| 701 | #endif | 701 | #endif |
| 702 | }; | 702 | }; |
| 703 | 703 | ||
| 704 | static int mt9m001_enum_fmt(struct v4l2_subdev *sd, int index, | 704 | static int mt9m001_enum_fmt(struct v4l2_subdev *sd, unsigned int index, |
| 705 | enum v4l2_mbus_pixelcode *code) | 705 | enum v4l2_mbus_pixelcode *code) |
| 706 | { | 706 | { |
| 707 | struct i2c_client *client = sd->priv; | 707 | struct i2c_client *client = sd->priv; |
| 708 | struct mt9m001 *mt9m001 = to_mt9m001(client); | 708 | struct mt9m001 *mt9m001 = to_mt9m001(client); |
| 709 | 709 | ||
| 710 | if ((unsigned int)index >= mt9m001->num_fmts) | 710 | if (index >= mt9m001->num_fmts) |
| 711 | return -EINVAL; | 711 | return -EINVAL; |
| 712 | 712 | ||
| 713 | *code = mt9m001->fmts[index].code; | 713 | *code = mt9m001->fmts[index].code; |