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

Commit 3bd90383 authored by Aditya Bavanari's avatar Aditya Bavanari
Browse files

asoc: sm6150: Fix logic in comparison of sound card name 



Use strlen instead of sizeof in strnstr operations
to return the exact size of sound card name.

Change-Id: Id579a41ed79d4443dac7dd2e709784e9dfa186ac
Signed-off-by: default avatarAditya Bavanari <abavanar@codeaurora.org>
parent 2088121c

asoc/sm6150.c

+9 −9
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
@@ -8795,8 +8795,8 @@ static int msm_init_aux_dev(struct platform_device *pdev, 
		__func__, found);



codec_aux_dev:

	if (!strnstr(card->name, "tavil", sizeof("tavil")) &&

	    !strnstr(card->name, "tasha", sizeof("tasha"))) {

	if (!strnstr(card->name, "tavil", strlen(card->name)) &&

	    !strnstr(card->name, "tasha", strlen(card->name))) {

		/* Get count of aux codec device phandles for this platform */

		codec_aux_dev_cnt = of_count_phandle_with_args(

					pdev->dev.of_node,
@@ -8984,8 +8984,8 @@ static int sm6150_ssr_enable(struct device *dev, void *data) 
		goto err;

	}



	if (strnstr(card->name, "tavil", sizeof("tavil")) ||

	    strnstr(card->name, "tasha", sizeof("tasha"))) {

	if (strnstr(card->name, "tavil", strlen(card->name)) ||

	    strnstr(card->name, "tasha", strlen(card->name))) {

		pdata = snd_soc_card_get_drvdata(card);

		if (!pdata->is_afe_config_done) {

			const char *be_dl_name = LPASS_BE_SLIMBUS_0_RX;
@@ -9028,8 +9028,8 @@ static void sm6150_ssr_disable(struct device *dev, void *data) 
	dev_dbg(dev, "%s: setting snd_card to OFFLINE\n", __func__);

	snd_soc_card_change_online_state(card, 0);



	if (strnstr(card->name, "tavil", sizeof("tavil")) ||

	    strnstr(card->name, "tasha", sizeof("tasha"))) {

	if (strnstr(card->name, "tavil", strlen(card->name)) ||

	    strnstr(card->name, "tasha", strlen(card->name))) {

		pdata = snd_soc_card_get_drvdata(card);

		msm_afe_clear_config();

		pdata->is_afe_config_done = false;
@@ -9252,8 +9252,8 @@ static int msm_asoc_machine_probe(struct platform_device *pdev) 
	}



	msm_i2s_auxpcm_init(pdev);

	if (!strnstr(card->name, "tavil", sizeof("tavil")) &&

	    !strnstr(card->name, "tasha", sizeof("tasha"))) {

	if (!strnstr(card->name, "tavil", strlen(card->name)) &&

	    !strnstr(card->name, "tasha", strlen(card->name))) {

		pdata->dmic01_gpio_p = of_parse_phandle(pdev->dev.of_node,

						      "qcom,cdc-dmic01-gpios",

						       0);