Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11895fd0 authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files

staging: mmal-vchiq: Avoid use of bool in structures 



[ Upstream commit 640e77466e69d9c28de227bc76881f5501f532ca ]

Fixes up a checkpatch error "Avoid using bool structure members
because of possible alignment issues".

Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Acked-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: f37e76abd614 ("staging: vc04_services: fix information leak in create_component()")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent cc9cd02d

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c

+6 −6
Original line number Diff line number Diff line
@@ -845,9 +845,9 @@ static int port_info_get(struct vchiq_mmal_instance *instance, 
		goto release_msg;



	if (rmsg->u.port_info_get_reply.port.is_enabled == 0)

		port->enabled = false;

		port->enabled = 0;

	else

		port->enabled = true;

		port->enabled = 1;



	/* copy the values out of the message */

	port->handle = rmsg->u.port_info_get_reply.port_handle;
@@ -1283,7 +1283,7 @@ static int port_disable(struct vchiq_mmal_instance *instance, 
	if (!port->enabled)

		return 0;



	port->enabled = false;

	port->enabled = 0;



	ret = port_action_port(instance, port,

			       MMAL_MSG_PORT_ACTION_TYPE_DISABLE);
@@ -1335,7 +1335,7 @@ static int port_enable(struct vchiq_mmal_instance *instance, 
	if (ret)

		goto done;



	port->enabled = true;

	port->enabled = 1;



	if (port->buffer_cb) {

		/* send buffer headers to videocore */
@@ -1502,7 +1502,7 @@ int vchiq_mmal_port_connect_tunnel(struct vchiq_mmal_instance *instance, 
			pr_err("failed disconnecting src port\n");

			goto release_unlock;

		}

		src->connected->enabled = false;

		src->connected->enabled = 0;

		src->connected = NULL;

	}
@@ -1746,7 +1746,7 @@ int vchiq_mmal_component_disable(struct vchiq_mmal_instance *instance, 


	ret = disable_component(instance, component);

	if (ret == 0)

		component->enabled = false;

		component->enabled = 0;



	mutex_unlock(&instance->vchiq_mutex);

drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ typedef void (*vchiq_mmal_buffer_cb)( 
		unsigned long length, u32 mmal_flags, s64 dts, s64 pts);



struct vchiq_mmal_port {

	bool enabled;

	u32 enabled:1;

	u32 handle;

	u32 type; /* port type, cached to use on port info set */

	u32 index; /* port index, cached to use on port info set */
@@ -81,7 +81,7 @@ struct vchiq_mmal_port { 
};



struct vchiq_mmal_component {

	bool enabled;

	u32 enabled:1;

	u32 handle;  /* VideoCore handle for component */

	u32 inputs;  /* Number of input ports */

	u32 outputs; /* Number of output ports */