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

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

Merge "ASoC: Fix warnings and errors with llvm"

parents 7961b26b 73ca7c6e

sound/soc/codecs/wcd_cpe_core.c

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

/* Copyright (c) 2014-2018,2020 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
@@ -1987,8 +1987,8 @@ struct wcd_cpe_core *wcd_cpe_init(const char *img_fname, 
	}



	card = codec->component.card->snd_card;

	snprintf(proc_name, (sizeof("cpe") + sizeof("_state") +

		 sizeof(id) - 2), "%s%d%s", cpe_name, id, state_name);

	snprintf(proc_name, sizeof(proc_name), "%s%d%s", cpe_name, id,

		state_name);

	entry = snd_info_create_card_entry(card, proc_name,

					   card->proc_root);

	if (entry) {

sound/soc/codecs/wsa881x.c

+3 −3
Original line number Diff line number Diff line 
/*

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

 * Copyright (c) 2015-2018,2020 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
@@ -362,8 +362,8 @@ static ssize_t wsa881x_swrslave_reg_show(char __user *ubuf, size_t count, 
			continue;

		swr_read(dbgwsa881x->swr_slave, devnum,

			i, &reg_val, 1);

		len = snprintf(tmp_buf, 25, "0x%.3x: 0x%.2x\n", i,

			       (reg_val & 0xFF));

		len = snprintf(tmp_buf, sizeof(tmp_buf), "0x%.3x: 0x%.2x\n",

				 i, (reg_val & 0xFF));

		if ((total + len) >= count - 1)

			break;

		if (copy_to_user((ubuf + total), tmp_buf, len)) {