From e4cd3c14cabd9c20ec6bc05e0dee45519f576fd7 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Tue, 17 Apr 2012 13:05:12 -0300 Subject: [PATCH] --- yaml --- r: 306260 b: refs/heads/master c: 6173850c95e3c2e51bd670011ae347862b098635 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/omap3isp/isppreview.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6fd351dd0cdb..9dc73eb2e97e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0b29e1e29ee5357f36f27411b5881e470484da5 +refs/heads/master: 6173850c95e3c2e51bd670011ae347862b098635 diff --git a/trunk/drivers/media/video/omap3isp/isppreview.c b/trunk/drivers/media/video/omap3isp/isppreview.c index 5bdf9e742c8e..f839cf866fa9 100644 --- a/trunk/drivers/media/video/omap3isp/isppreview.c +++ b/trunk/drivers/media/video/omap3isp/isppreview.c @@ -608,12 +608,12 @@ preview_config_rgb_blending(struct isp_prev_device *prev, const void *rgb2rgb) } /* - * Configures the RGB-YCbYCr conversion matrix + * Configures the color space conversion (RGB toYCbYCr) matrix * @prev_csc: Structure containing the RGB to YCbYCr matrix and the * YCbCr offset. */ static void -preview_config_rgb_to_ycbcr(struct isp_prev_device *prev, const void *prev_csc) +preview_config_csc(struct isp_prev_device *prev, const void *prev_csc) { struct isp_device *isp = to_isp_device(prev); const struct omap3isp_prev_csc *csc = prev_csc; @@ -860,7 +860,7 @@ static const struct preview_update update_attrs[] = { FIELD_SIZEOF(struct prev_params, rgb2rgb), offsetof(struct omap3isp_prev_update_config, rgb2rgb), }, /* OMAP3ISP_PREV_COLOR_CONV */ { - preview_config_rgb_to_ycbcr, + preview_config_csc, NULL, offsetof(struct prev_params, csc), FIELD_SIZEOF(struct prev_params, csc),