V4L/DVB: mediabus: fix ambiguous pixel code names

[net-next-2.6.git] / drivers / media / video / mt9t112.c

diff --git a/drivers/media/video/mt9t112.c b/drivers/media/video/mt9t112.c
index e4bf1db9a87b4d978eaad6646c1fed2b1076cf70..8ec47e42d4d0d7e630f114e1dc85eb1c0d415cf8 100644 (file)
--- a/drivers/media/video/mt9t112.c
+++ b/drivers/media/video/mt9t112.c
@@ -121,22 +121,22 @@ struct mt9t112_priv {
 
 static const struct mt9t112_format mt9t112_cfmts[] = {
        {
-               .code           = V4L2_MBUS_FMT_YUYV8_2X8_BE,
+               .code           = V4L2_MBUS_FMT_UYVY8_2X8,
                .colorspace     = V4L2_COLORSPACE_JPEG,
                .fmt            = 1,
                .order          = 0,
        }, {
-               .code           = V4L2_MBUS_FMT_YVYU8_2X8_BE,
+               .code           = V4L2_MBUS_FMT_VYUY8_2X8,
                .colorspace     = V4L2_COLORSPACE_JPEG,
                .fmt            = 1,
                .order          = 1,
        }, {
-               .code           = V4L2_MBUS_FMT_YUYV8_2X8_LE,
+               .code           = V4L2_MBUS_FMT_YUYV8_2X8,
                .colorspace     = V4L2_COLORSPACE_JPEG,
                .fmt            = 1,
                .order          = 2,
        }, {
-               .code           = V4L2_MBUS_FMT_YVYU8_2X8_LE,
+               .code           = V4L2_MBUS_FMT_YVYU8_2X8,
                .colorspace     = V4L2_COLORSPACE_JPEG,
                .fmt            = 1,
                .order          = 3,
@@ -972,7 +972,7 @@ static int mt9t112_s_crop(struct v4l2_subdev *sd, struct v4l2_crop *a)
        struct v4l2_rect *rect = &a->c;
 
        return mt9t112_set_params(client, rect->width, rect->height,
-                                V4L2_MBUS_FMT_YUYV8_2X8_BE);
+                                V4L2_MBUS_FMT_UYVY8_2X8);
 }
 
 static int mt9t112_g_fmt(struct v4l2_subdev *sd,
@@ -983,7 +983,7 @@ static int mt9t112_g_fmt(struct v4l2_subdev *sd,
 
        if (!priv->format) {
                int ret = mt9t112_set_params(client, VGA_WIDTH, VGA_HEIGHT,
-                                            V4L2_MBUS_FMT_YUYV8_2X8_BE);
+                                            V4L2_MBUS_FMT_UYVY8_2X8);
                if (ret < 0)
                        return ret;
        }