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

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

Merge "asoc: Use soc_find_component_locked API"

parents 7e76c13b 4fcf3b41

asoc/bengal.c

+2 −2
Original line number Diff line number Diff line
@@ -6370,7 +6370,7 @@ static int msm_init_aux_dev(struct platform_device *pdev, 
			ret = -EINVAL;

			goto err;

		}

		if (soc_find_component(wsa_of_node, NULL)) {

		if (soc_find_component_locked(wsa_of_node, NULL)) {

			/* WSA device registered with ALSA core */

			wsa881x_dev_info[found].of_node = wsa_of_node;

			wsa881x_dev_info[found].index = i;
@@ -6467,7 +6467,7 @@ static int msm_init_aux_dev(struct platform_device *pdev, 
			ret = -EINVAL;

			goto err;

		}

		if (soc_find_component(aux_codec_of_node, NULL)) {

		if (soc_find_component_locked(aux_codec_of_node, NULL)) {

			/* AUX codec registered with ALSA core */

			aux_cdc_dev_info[codecs_found].of_node =

						aux_codec_of_node;

asoc/kona.c

+2 −2
Original line number Diff line number Diff line
@@ -7896,7 +7896,7 @@ static int msm_init_aux_dev(struct platform_device *pdev, 
			ret = -EINVAL;

			goto err;

		}

		if (soc_find_component(wsa_of_node, NULL)) {

		if (soc_find_component_locked(wsa_of_node, NULL)) {

			/* WSA device registered with ALSA core */

			wsa881x_dev_info[found].of_node = wsa_of_node;

			wsa881x_dev_info[found].index = i;
@@ -7993,7 +7993,7 @@ static int msm_init_aux_dev(struct platform_device *pdev, 
			ret = -EINVAL;

			goto err;

		}

		if (soc_find_component(aux_codec_of_node, NULL)) {

		if (soc_find_component_locked(aux_codec_of_node, NULL)) {

			/* AUX codec registered with ALSA core */

			aux_cdc_dev_info[codecs_found].of_node =

						aux_codec_of_node;