Merge branch 'regulator-4.21' into regulator-5.0

526d02dd · Mark Brown · bfeffd15 · 4cac31e2 · 526d02dd
Commit 526d02dd authored Jan 07, 2019 by Mark Brown
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/regulator/lochnagar-regulator.c drivers/regulator/lochnagar-regulator.c +1 -1

No files found.
--- a/drivers/regulator/lochnagar-regulator.c
+++ b/drivers/regulator/lochnagar-regulator.c
@@ -226,7 +226,7 @@ static const struct of_device_id lochnagar_of_match[] = {
 	},
 	{
 		.compatible = "cirrus,lochnagar2-mic2vdd",
-		.data = &lochnagar_regulators[LOCHNAGAR_MIC1VDD],
+		.data = &lochnagar_regulators[LOCHNAGAR_MIC2VDD],
 	},
 	{
 		.compatible = "cirrus,lochnagar2-vddcore",