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

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

Merge "mfd: wcd9xxx: Add range checking in function wcd9xxx_init_slimslave"

parents 003f49db 167a094e

drivers/mfd/wcd9xxx-slimslave.c

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

/* Copyright (c) 2012-2017, 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
@@ -62,6 +62,10 @@ int wcd9xxx_init_slimslave(struct wcd9xxx *wcd9xxx, u8 wcd9xxx_pgd_la, 
		goto err;

	}



	if (!rx_num || rx_num > wcd9xxx->num_rx_port) {

		pr_err("%s: invalid rx num %d\n", __func__, rx_num);

		return -EINVAL;

	}

	if (wcd9xxx->rx_chs) {

		wcd9xxx->num_rx_port = rx_num;

		for (i = 0; i < rx_num; i++) {
@@ -84,6 +88,10 @@ int wcd9xxx_init_slimslave(struct wcd9xxx *wcd9xxx, u8 wcd9xxx_pgd_la, 
			wcd9xxx->num_rx_port);

	}



	if (!tx_num || tx_num > wcd9xxx->num_tx_port) {

		pr_err("%s: invalid tx num %d\n", __func__, tx_num);

		return -EINVAL;

	}

	if (wcd9xxx->tx_chs) {

		wcd9xxx->num_tx_port = tx_num;

		for (i = 0; i < tx_num; i++) {

sound/soc/msm/msm8998.c

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

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

 * Copyright (c) 2016-2017, 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
@@ -3323,6 +3323,17 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd) 
					    134, 135, 136, 137, 138, 139,

					    140, 141, 142, 143};



	/* Tavil Codec SLIMBUS configuration

	 * RX1, RX2, RX3, RX4, RX5, RX6, RX7, RX8

	 * TX1, TX2, TX3, TX4, TX5, TX6, TX7, TX8, TX9, TX10, TX11, TX12, TX13

	 * TX14, TX15, TX16

	 */

	unsigned int rx_ch_tavil[WCD934X_RX_MAX] = {144, 145, 146, 147, 148,

					    149, 150, 151};

	unsigned int tx_ch_tavil[WCD934X_TX_MAX] = {128, 129, 130, 131, 132,

					    134, 135, 136, 137, 138, 139,

					    133, 140, 141, 142, 143};



	pr_info("%s: dev_name%s\n", __func__, dev_name(cpu_dai->dev));



	rtd->pmdown_time = 0;
@@ -3383,8 +3394,15 @@ static int msm_audrx_init(struct snd_soc_pcm_runtime *rtd) 


	snd_soc_dapm_sync(dapm);



	if (!strcmp(dev_name(codec_dai->dev), "tavil_codec")) {

		snd_soc_dai_set_channel_map(codec_dai, ARRAY_SIZE(tx_ch_tavil),

					tx_ch_tavil, ARRAY_SIZE(rx_ch_tavil),

					rx_ch_tavil);

	} else {

		snd_soc_dai_set_channel_map(codec_dai, ARRAY_SIZE(tx_ch),

				    tx_ch, ARRAY_SIZE(rx_ch), rx_ch);

					tx_ch, ARRAY_SIZE(rx_ch),

					rx_ch);

	}



	if (!strcmp(dev_name(codec_dai->dev), "tavil_codec")) {

		msm_codec_fn.get_afe_config_fn = tavil_get_afe_config;