media: i2c: mt9v032: fix enum mbus codes and frame sizes

[linux.git] / drivers / media / i2c / mt9v032.c

diff --git a/drivers/media/i2c/mt9v032.c b/drivers/media/i2c/mt9v032.c
index 4b9b98cf6674c3924b41567bbc546a66c002f94e..5bd3ae82992f35b59339f8283471caed95c3d6c4 100644 (file)
--- a/drivers/media/i2c/mt9v032.c
+++ b/drivers/media/i2c/mt9v032.c
@@ -428,10 +428,12 @@ static int mt9v032_enum_mbus_code(struct v4l2_subdev *subdev,
                                  struct v4l2_subdev_pad_config *cfg,
                                  struct v4l2_subdev_mbus_code_enum *code)
 {
+       struct mt9v032 *mt9v032 = to_mt9v032(subdev);
+
        if (code->index > 0)
                return -EINVAL;
 
-       code->code = MEDIA_BUS_FMT_SGRBG10_1X10;
+       code->code = mt9v032->format.code;
        return 0;
 }
 
@@ -439,7 +441,11 @@ static int mt9v032_enum_frame_size(struct v4l2_subdev *subdev,
                                   struct v4l2_subdev_pad_config *cfg,
                                   struct v4l2_subdev_frame_size_enum *fse)
 {
-       if (fse->index >= 3 || fse->code != MEDIA_BUS_FMT_SGRBG10_1X10)
+       struct mt9v032 *mt9v032 = to_mt9v032(subdev);
+
+       if (fse->index >= 3)
+               return -EINVAL;
+       if (mt9v032->format.code != fse->code)
                return -EINVAL;
 
        fse->min_width = MT9V032_WINDOW_WIDTH_DEF / (1 << fse->index);