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

Commit a635a6f9 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soc: qcom: hab: unify variable type to avoid implicit conversion"

parents 19b117fe ac67229d

drivers/soc/qcom/hab/ghs_comm.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -39,7 +39,7 @@ int physical_channel_send(struct physical_channel *pchan, 
		struct hab_header *header,

		void *payload)

{

	int sizebytes = HAB_HEADER_GET_SIZE(*header);

	size_t sizebytes = HAB_HEADER_GET_SIZE(*header);

	struct ghs_vdev *dev  = (struct ghs_vdev *)pchan->hyp_data;

	GIPC_Result result;

	uint8_t *msg;

drivers/soc/qcom/hab/qvm_comm.c

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -42,9 +42,9 @@ int physical_channel_send(struct physical_channel *pchan, 
		struct hab_header *header,

		void *payload)

{

	int sizebytes = HAB_HEADER_GET_SIZE(*header);

	size_t sizebytes = HAB_HEADER_GET_SIZE(*header);

	struct qvm_channel *dev  = (struct qvm_channel *)pchan->hyp_data;

	int total_size = sizeof(*header) + sizebytes;

	size_t total_size = sizeof(*header) + sizebytes;



	if (total_size > dev->pipe_ep->tx_info.sh_buf->size)

		return -EINVAL; /* too much data for ring */