Merge remote-tracking branch 'asoc/topic/log' into asoc-next

Mark Brown
2 parents 20694ad278 c871bd0b2e
Showing 1 changed file Side-by-side Diff
sound/soc/soc-core.c
@@ -4155,9 +4155,9 @@
 		ret = of_property_read_string_index(np, propname,
 			2 * i, &routes[i].sink);
 		if (ret) {
-			dev_err(card->dev, "ASoC: Property '%s' index %d"
-				" could not be read: %d\n", propname, 2 * i,
-				ret);
+			dev_err(card->dev,
+				"ASoC: Property '%s' index %d could not be read: %d\n",
+				propname, 2 * i, ret);
 			kfree(routes);
 			return -EINVAL;
 		}
@@ -4165,8 +4165,8 @@
 			(2 * i) + 1, &routes[i].source);
 		if (ret) {
 			dev_err(card->dev,
-				"ASoC: Property '%s' index %d could not be"
-				" read: %d\n", propname, (2 * i) + 1, ret);
+				"ASoC: Property '%s' index %d could not be read: %d\n",
+				propname, (2 * i) + 1, ret);
 			kfree(routes);
 			return -EINVAL;
 		}
...	...	@@ -4155,9 +4155,9 @@
4155	4155	ret = of_property_read_string_index(np, propname,
4156	4156	2 * i, &routes[i].sink);
4157	4157	if (ret) {
4158		- dev_err(card->dev, "ASoC: Property '%s' index %d"
4159		- " could not be read: %d\n", propname, 2 * i,
4160		- ret);
	4158	+ dev_err(card->dev,
	4159	+ "ASoC: Property '%s' index %d could not be read: %d\n",
	4160	+ propname, 2 * i, ret);
4161	4161	kfree(routes);
4162	4162	return -EINVAL;
4163	4163	}
...	...	@@ -4165,8 +4165,8 @@
4165	4165	(2 * i) + 1, &routes[i].source);
4166	4166	if (ret) {
4167	4167	dev_err(card->dev,
4168		- "ASoC: Property '%s' index %d could not be"
4169		- " read: %d\n", propname, (2 * i) + 1, ret);
	4168	+ "ASoC: Property '%s' index %d could not be read: %d\n",
	4169	+ propname, (2 * i) + 1, ret);
4170	4170	kfree(routes);
4171	4171	return -EINVAL;
4172	4172	}