Merge remote-tracking branch 'asoc/fix/core' into asoc-next (23af7b0b) · Commits · e / devices / android_kernel_oneplus_sm7250

sound/soc/soc-core.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -3140,7 +3140,7 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
		if (params->mask) {
		ret = regmap_read(codec->control_data, params->base, &val);
		if (ret != 0)
		return ret;
		goto out;

		val &= params->mask;

		@@ -3158,13 +3158,15 @@ int snd_soc_bytes_put(struct snd_kcontrol *kcontrol,
		((u32 *)data)[0] \|= cpu_to_be32(val);
		break;
		default:
		return -EINVAL;
		ret = -EINVAL;
		goto out;
		}
		}

		ret = regmap_raw_write(codec->control_data, params->base,
		data, len);

		out:
		kfree(data);

		return ret;
		@@ -4197,7 +4199,6 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
		dev_err(card->dev,
		"ASoC: Property '%s' index %d could not be read: %d\n",
		propname, 2 * i, ret);
		kfree(routes);
		return -EINVAL;
		}
		ret = of_property_read_string_index(np, propname,
		@@ -4206,7 +4207,6 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
		dev_err(card->dev,
		"ASoC: Property '%s' index %d could not be read: %d\n",
		propname, (2 * i) + 1, ret);
		kfree(routes);
		return -EINVAL;
		}
		}