git.openwrt.org Git - openwrt/staging/yousong.git/blob

   1 From 48d22b014512b2dac7e625748509c4360b79f085 Mon Sep 17 00:00:00 2001
   2 From: Eric Anholt <eric@anholt.net>
   3 Date: Thu, 10 May 2018 12:42:20 -0700
   4 Subject: [PATCH 379/454] staging: bcm2835: Fix mmal_port_parameter_get()
   5  signed/unsigned warnings.
   6
   7 commit 9dabe666d33d00849b05c5c46cc31dec39004ba7 upstream
   8
   9 The arg is a u32 *, so switch over to that in our declarations.
  10
  11 Signed-off-by: Eric Anholt <eric@anholt.net>
  12 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  13 ---
  14  .../staging/vc04_services/bcm2835-camera/bcm2835-camera.c   | 6 +++---
  15  1 file changed, 3 insertions(+), 3 deletions(-)
  16
  17 --- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  18 +++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
  19 @@ -522,7 +522,7 @@ static int start_streaming(struct vb2_qu
  20  {
  21         struct bm2835_mmal_dev *dev = vb2_get_drv_priv(vq);
  22         int ret;
  23 -       int parameter_size;
  24 +       u32 parameter_size;
  25
  26         v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, "%s: dev:%p\n",
  27                  __func__, dev);
  28 @@ -1522,7 +1522,7 @@ static int get_num_cameras(struct vchiq_
  29         int ret;
  30         struct vchiq_mmal_component  *cam_info_component;
  31         struct mmal_parameter_camera_info_t cam_info = {0};
  32 -       int param_size = sizeof(cam_info);
  33 +       u32 param_size = sizeof(cam_info);
  34         int i;
  35
  36         /* create a camera_info component */
  37 @@ -1586,7 +1586,7 @@ static int __init mmal_init(struct bm283
  38         int ret;
  39         struct mmal_es_format_local *format;
  40         u32 supported_encodings[MAX_SUPPORTED_ENCODINGS];
  41 -       int param_size;
  42 +       u32 param_size;
  43         struct vchiq_mmal_component  *camera;
  44
  45         ret = vchiq_mmal_init(&dev->instance);