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

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

Merge "asoc: sm6150: use locked version of soc_find_component"

parents 700fc43d 7b2a8cfe

asoc/sm6150.c

+2 −2
Original line number Diff line number Diff line
@@ -8127,7 +8127,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;
@@ -8194,7 +8194,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;