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

Commit d2221e76 authored by Swetha Chikkaboraiah's avatar Swetha Chikkaboraiah Committed by Georg Veichtlbauer
Browse files

BACKPORT: driver: Fix compilation error with new sdclang 12



Fix the compilation error with sdclang 12.0.

Change-Id: If6b5caf655568b0d4ee12a71927df9476f3b4c55
Signed-off-by: default avatarSwetha Chikkaboraiah <schikk@codeaurora.org>
parent e2a3c4c0
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void *diagmem_alloc(struct diagchar_dev *driver, int size, int pool_type)
			break;
		}
		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",
					   mempool->name, size);
			break;
+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static void __dump_packet(u8 *packet)
	/* row must contain enough for 0xdeadbaad * 8 to be converted into
	 * "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) {
		int bytes_to_read = ((c + 1) * row_size > packet_size) ?
+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ static ssize_t hdmi_tx_sysfs_wta_edid(struct device *dev,
	memset(hdmi_ctrl->edid_buf, 0, hdmi_ctrl->edid_buf_size);

	while (edid_size--) {
		char t[char_to_nib + 1];
		char t[3]; /* char_to_nib + 1; */
		int d;

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