You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.6 KiB
Diff
46 lines
1.6 KiB
Diff
6 years ago
|
From 48d22b014512b2dac7e625748509c4360b79f085 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Eric Anholt <eric@anholt.net>
|
||
|
|
Date: Thu, 10 May 2018 12:42:20 -0700
|
||
|
|
Subject: [PATCH 379/454] staging: bcm2835: Fix mmal_port_parameter_get()
|
||
|
|
signed/unsigned warnings.
|
||
|
|
|
||
|
|
commit 9dabe666d33d00849b05c5c46cc31dec39004ba7 upstream
|
||
|
|
|
||
|
|
The arg is a u32 *, so switch over to that in our declarations.
|
||
|
|
|
||
|
|
Signed-off-by: Eric Anholt <eric@anholt.net>
|
||
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||
|
|
---
|
||
|
|
.../staging/vc04_services/bcm2835-camera/bcm2835-camera.c | 6 +++---
|
||
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
||
|
|
+++ b/drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
|
||
|
|
@@ -522,7 +522,7 @@ static int start_streaming(struct vb2_qu
|
||
|
|
{
|
||
|
|
struct bm2835_mmal_dev *dev = vb2_get_drv_priv(vq);
|
||
|
|
int ret;
|
||
|
|
- int parameter_size;
|
||
|
|
+ u32 parameter_size;
|
||
|
|
|
||
|
|
v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev, "%s: dev:%p\n",
|
||
|
|
__func__, dev);
|
||
|
|
@@ -1522,7 +1522,7 @@ static int get_num_cameras(struct vchiq_
|
||
|
|
int ret;
|
||
|
|
struct vchiq_mmal_component *cam_info_component;
|
||
|
|
struct mmal_parameter_camera_info_t cam_info = {0};
|
||
|
|
- int param_size = sizeof(cam_info);
|
||
|
|
+ u32 param_size = sizeof(cam_info);
|
||
|
|
int i;
|
||
|
|
|
||
|
|
/* create a camera_info component */
|
||
|
|
@@ -1586,7 +1586,7 @@ static int __init mmal_init(struct bm283
|
||
|
|
int ret;
|
||
|
|
struct mmal_es_format_local *format;
|
||
|
|
u32 supported_encodings[MAX_SUPPORTED_ENCODINGS];
|
||
|
|
- int param_size;
|
||
|
|
+ u32 param_size;
|
||
|
|
struct vchiq_mmal_component *camera;
|
||
|
|
|
||
|
|
ret = vchiq_mmal_init(&dev->instance);
|