evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[media] media: davinci: vpbe: fix build warning

Browse source 
recent patch with commit id 4f996594ce
which makes vidioc_s_crop const, was causing a following build warning,
vpbe_display.c: In function 'vpbe_display_s_crop':
vpbe_display.c:640: warning: initialization discards qualifiers from pointer target type
This patch fixes the above build warning.

Signed-off-by: Lad, Prabhakar <prabhakar.lad@ti.com>
Signed-off-by: Manjunath Hadli <manjunath.hadli@ti.com>
Acked-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Lad, Prabhakar 2012-10-03 02:13:28 -03:00 • committed by Mauro Carvalho Chehab
parent ad7dcb334a
commit fabc4e948b
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/media/platform/davinci/vpbe_display.c
View file

@ -637,7 +637,7 @@ static int vpbe_display_s_crop(struct file *file, void *priv,
struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev;
struct osd_layer_config *cfg = &layer->layer_info.config; struct osd_layer_config *cfg = &layer->layer_info.config;
struct osd_state *osd_device = disp_dev->osd_device; struct osd_state *osd_device = disp_dev->osd_device;
struct v4l2_rect *rect = &crop->c; struct v4l2_rect rect = crop->c;
int ret; int ret;
v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
@ -648,21 +648,21 @@ static int vpbe_display_s_crop(struct file *file, void *priv,
return -EINVAL; return -EINVAL;
} }
if (rect->top < 0) if (rect.top < 0)
rect->top = 0; rect.top = 0;
if (rect->left < 0) if (rect.left < 0)
rect->left = 0; rect.left = 0;
vpbe_disp_check_window_params(disp_dev, rect); vpbe_disp_check_window_params(disp_dev, &rect);
osd_device->ops.get_layer_config(osd_device, osd_device->ops.get_layer_config(osd_device,
layer->layer_info.id, cfg); layer->layer_info.id, cfg);
vpbe_disp_calculate_scale_factor(disp_dev, layer, vpbe_disp_calculate_scale_factor(disp_dev, layer,
rect->width, rect.width,
rect->height); rect.height);
vpbe_disp_adj_position(disp_dev, layer, rect->top, vpbe_disp_adj_position(disp_dev, layer, rect.top,
rect->left); rect.left);
ret = osd_device->ops.set_layer_config(osd_device, ret = osd_device->ops.set_layer_config(osd_device,
layer->layer_info.id, cfg); layer->layer_info.id, cfg);
if (ret < 0) { if (ret < 0) {