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

Commit ec522445 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "driver: Fix compilation error with new sdclang 12"

parents 7c5403b4 17344d78

drivers/char/diag/diagmem.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -172,7 +172,7 @@ void *diagmem_alloc(struct diagchar_dev *driver, int size, int pool_type) 
			break;

			break;

		}

		}

		if (size == 0 || size > mempool->itemsize ||

		if (size == 0 || size > mempool->itemsize ||

			size > (int)mempool->pool->pool_data) {

			size > (size_t)mempool->pool->pool_data) {

			pr_err_ratelimited("diag: cannot alloc from mempool %s, invalid size: %d\n",

			pr_err_ratelimited("diag: cannot alloc from mempool %s, invalid size: %d\n",

					   mempool->name, size);

					   mempool->name, size);

			break;

			break;

drivers/media/platform/msm/vidc_3x/venus_hfi.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -135,7 +135,7 @@ static void __dump_packet(u8 *packet) 
	/* row must contain enough for 0xdeadbaad * 8 to be converted into

	/* row must contain enough for 0xdeadbaad * 8 to be converted into

	 * "de ad ba ab " * 8 + '\0'

	 * "de ad ba ab " * 8 + '\0'

	 */

	 */

	char row[3 * row_size];

	char row[96]; /*char row[3 * row_size];*/





	for (c = 0; c * row_size < packet_size; ++c) {

	for (c = 0; c * row_size < packet_size; ++c) {

		int bytes_to_read = ((c + 1) * row_size > packet_size) ?

		int bytes_to_read = ((c + 1) * row_size > packet_size) ?

drivers/misc/qseecom.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3704,8 +3704,8 @@ static int __qseecom_send_cmd(struct qseecom_dev_handle *data, 
				(uint32_t)(__qseecom_uvirt_to_kphys(

				(uint32_t)(__qseecom_uvirt_to_kphys(

				data, (uintptr_t)req->resp_buf));

				data, (uintptr_t)req->resp_buf));

		} else {

		} else {

			send_data_req.req_ptr = (uint32_t)req->cmd_req_buf;

			send_data_req.req_ptr = (uintptr_t)req->cmd_req_buf;

			send_data_req.rsp_ptr = (uint32_t)req->resp_buf;

			send_data_req.rsp_ptr = (uintptr_t)req->resp_buf;

		}

		}





		send_data_req.req_len = req->cmd_req_len;

		send_data_req.req_len = req->cmd_req_len;

drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_hw_stats.c

+2 −2
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// SPDX-License-Identifier: GPL-2.0-only

/*

/*

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

 * Copyright (c) 2017-2019, 2021, The Linux Foundation. All rights reserved.

 */

 */





#include "ipahal.h"

#include "ipahal.h"
@@ -225,7 +225,7 @@ static struct ipahal_stats_init_pyld *ipahal_generate_init_pyld_flt_rt_v4_5( 
	void *params, bool is_atomic_ctx)

	void *params, bool is_atomic_ctx)

{

{

	struct ipahal_stats_init_pyld *pyld;

	struct ipahal_stats_init_pyld *pyld;

	int num = (int)(params);

	int num = (uintptr_t)(params);





	if (num > IPA_MAX_FLT_RT_CNT_INDEX ||

	if (num > IPA_MAX_FLT_RT_CNT_INDEX ||

		num <= 0) {

		num <= 0) {

drivers/video/fbdev/msm/mdss_hdmi_tx.c

+2 −2
Original line number Original line Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

// SPDX-License-Identifier: GPL-2.0-only

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

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





#include <linux/bitops.h>

#include <linux/bitops.h>

#include <linux/delay.h>

#include <linux/delay.h>
@@ -649,7 +649,7 @@ static ssize_t edid_store(struct device *dev, 
	memset(hdmi_ctrl->edid_buf, 0, hdmi_ctrl->edid_buf_size);

	memset(hdmi_ctrl->edid_buf, 0, hdmi_ctrl->edid_buf_size);





	while (edid_size--) {

	while (edid_size--) {

		char t[char_to_nib + 1];

		char t[3]; /* char_to_nib + 1; */

		int d;

		int d;





		memcpy(t, buf_t, sizeof(char) * char_to_nib);

		memcpy(t, buf_t, sizeof(char) * char_to_nib);