From: Michael Zoran Date: Thu, 9 Mar 2017 05:10:09 +0000 (-0800) Subject: staging: bcm2835_camera: Convert control_service field of mmal_msg_header to u32 X-Git-Tag: v4.12-rc1~84^2~724 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=81b2cbdbf34f6696c2e2b657873c62489ef1f773;p=linux.git staging: bcm2835_camera: Convert control_service field of mmal_msg_header to u32 The camera driver passes messages back and forth between the firmware with requests and replies. One of the fields of the message header called control_service is a pointer so the size changes between 32 bit and 64 bit. Luckly, the field is not interperated by the driver, so it can be changed to a u32 which has a fixed size. Signed-off-by: Michael Zoran Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h index 9fa222f65f5b..748f2c824305 100644 --- a/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +++ b/drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h @@ -84,7 +84,7 @@ struct mmal_msg_header { u32 type; /** enum mmal_msg_type */ /* Opaque handle to the control service */ - struct mmal_control_service *control_service; + u32 control_service; struct mmal_msg_context *context; /** a u32 per message context */ u32 status; /** The status of the vchiq operation */