aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLad, Prabhakar <prabhakar.lad@ti.com>2012-10-03 01:13:28 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-10-05 13:28:46 -0400
commitfabc4e948b0ebe128ec54687bae01f216e34bb41 (patch)
tree773d7a5fc5a020e58f38e82f088aa1178faebee7 /drivers/media
parentad7dcb334a0dbba9ac611d43c4e0ff7973eaa1cf (diff)
[media] media: davinci: vpbe: fix build warning
recent patch with commit id 4f996594ceaf6c3f9bc42b40c40b0f7f87b79c86 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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/davinci/vpbe_display.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/platform/davinci/vpbe_display.c b/drivers/media/platform/davinci/vpbe_display.c
index 1b238fe07e80..161c77650e2f 100644
--- a/drivers/media/platform/davinci/vpbe_display.c
+++ b/drivers/media/platform/davinci/vpbe_display.c
@@ -637,7 +637,7 @@ static int vpbe_display_s_crop(struct file *file, void *priv,
637 struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev; 637 struct vpbe_device *vpbe_dev = disp_dev->vpbe_dev;
638 struct osd_layer_config *cfg = &layer->layer_info.config; 638 struct osd_layer_config *cfg = &layer->layer_info.config;
639 struct osd_state *osd_device = disp_dev->osd_device; 639 struct osd_state *osd_device = disp_dev->osd_device;
640 struct v4l2_rect *rect = &crop->c; 640 struct v4l2_rect rect = crop->c;
641 int ret; 641 int ret;
642 642
643 v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev, 643 v4l2_dbg(1, debug, &vpbe_dev->v4l2_dev,
@@ -648,21 +648,21 @@ static int vpbe_display_s_crop(struct file *file, void *priv,
648 return -EINVAL; 648 return -EINVAL;
649 } 649 }
650 650
651 if (rect->top < 0) 651 if (rect.top < 0)
652 rect->top = 0; 652 rect.top = 0;
653 if (rect->left < 0) 653 if (rect.left < 0)
654 rect->left = 0; 654 rect.left = 0;
655 655
656 vpbe_disp_check_window_params(disp_dev, rect); 656 vpbe_disp_check_window_params(disp_dev, &rect);
657 657
658 osd_device->ops.get_layer_config(osd_device, 658 osd_device->ops.get_layer_config(osd_device,
659 layer->layer_info.id, cfg); 659 layer->layer_info.id, cfg);
660 660
661 vpbe_disp_calculate_scale_factor(disp_dev, layer, 661 vpbe_disp_calculate_scale_factor(disp_dev, layer,
662 rect->width, 662 rect.width,
663 rect->height); 663 rect.height);
664 vpbe_disp_adj_position(disp_dev, layer, rect->top, 664 vpbe_disp_adj_position(disp_dev, layer, rect.top,
665 rect->left); 665 rect.left);
666 ret = osd_device->ops.set_layer_config(osd_device, 666 ret = osd_device->ops.set_layer_config(osd_device,
667 layer->layer_info.id, cfg); 667 layer->layer_info.id, cfg);
668 if (ret < 0) { 668 if (ret < 0) {