pinctrl: cy8c95x0: Lock register accesses in cy8c95x0_set_mux()

andy-shev · Linus Walleij · commit 56e380cfcd82 · 2022-09-20T11:22:12.000+02:00
It seems that cy8c95x0_set_mux() missed serialization of IO access. And its implementation looks half-baked. Add locking to the function. Fixes: e6cbbe4 ("pinctrl: Add Cypress cy8c95x0 support") Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Link: https://lore.kernel.org/r/20220916205450.86278-1-andriy.shevchenko@linux.intel.com Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
diff --git a/drivers/pinctrl/pinctrl-cy8c95x0.c b/drivers/pinctrl/pinctrl-cy8c95x0.c
@@ -1152,8 +1152,13 @@ static int cy8c95x0_set_mux(struct pinctrl_dev *pctldev, unsigned int selector,
 			    unsigned int group)
 {
 	struct cy8c95x0_pinctrl *chip = pinctrl_dev_get_drvdata(pctldev);
+	int ret;
 
-	return cy8c95x0_pinmux_cfg(chip, selector, group);
+	mutex_lock(&chip->i2c_lock);
+	ret = cy8c95x0_pinmux_cfg(chip, selector, group);
+	mutex_unlock(&chip->i2c_lock);
+
+	return ret;
 }
 
 static const struct pinmux_ops cy8c95x0_pmxops = {

Original file line number	Diff line number	Diff line change
`@@ -1152,8 +1152,13 @@ static int cy8c95x0_set_mux(struct pinctrl_dev *pctldev, unsigned int selector,`
`1152`	`1152`	`unsigned int group)`
`1153`	`1153`	`{`
`1154`	`1154`	`struct cy8c95x0_pinctrl *chip = pinctrl_dev_get_drvdata(pctldev);`
	`1155`	`+ int ret;`
`1155`	`1156`
`1156`		`- return cy8c95x0_pinmux_cfg(chip, selector, group);`
	`1157`	`+ mutex_lock(&chip->i2c_lock);`
	`1158`	`+ ret = cy8c95x0_pinmux_cfg(chip, selector, group);`
	`1159`	`+ mutex_unlock(&chip->i2c_lock);`
	`1160`	`+`
	`1161`	`+ return ret;`
`1157`	`1162`	`}`
`1158`	`1163`
`1159`	`1164`	`static const struct pinmux_ops cy8c95x0_pmxops = {`