media: i2c: hi846: check return value of regulator_bulk_disable()

merge · mchehab · commit e1cc0a05539a · 2021-12-16T20:54:53.000+01:00
regulator_bulk_disable can fail and thus suspend() can. Handle that error
gracefully.

Signed-off-by: Martin Kepplinger &lt;martin.kepplinger@puri.sm&gt;
Signed-off-by: Sakari Ailus &lt;sakari.ailus@linux.intel.com&gt;
Signed-off-by: Mauro Carvalho Chehab &lt;mchehab+huawei@kernel.org&gt;
diff --git a/drivers/media/i2c/hi846.c b/drivers/media/i2c/hi846.c
@@ -1656,7 +1656,7 @@ static int hi846_power_on(struct hi846 *hi846)
 	return ret;
 }
 
-static void hi846_power_off(struct hi846 *hi846)
+static int hi846_power_off(struct hi846 *hi846)
 {
 	if (hi846->rst_gpio)
 		gpiod_set_value_cansleep(hi846->rst_gpio, 1);
@@ -1665,7 +1665,7 @@ static void hi846_power_off(struct hi846 *hi846)
 		gpiod_set_value_cansleep(hi846->shutdown_gpio, 1);
 
 	clk_disable_unprepare(hi846->clock);
-	regulator_bulk_disable(HI846_NUM_SUPPLIES, hi846->supplies);
+	return regulator_bulk_disable(HI846_NUM_SUPPLIES, hi846->supplies);
 }
 
 static int __maybe_unused hi846_suspend(struct device *dev)
@@ -1677,9 +1677,7 @@ static int __maybe_unused hi846_suspend(struct device *dev)
 	if (hi846->streaming)
 		hi846_stop_streaming(hi846);
 
-	hi846_power_off(hi846);
-
-	return 0;
+	return hi846_power_off(hi846);
 }
 
 static int __maybe_unused hi846_resume(struct device *dev)

Original file line number	Diff line number	Diff line change
`@@ -1656,7 +1656,7 @@ static int hi846_power_on(struct hi846 *hi846)`
`1656`	`1656`	`return ret;`
`1657`	`1657`	`}`
`1658`	`1658`
`1659`		`-static void hi846_power_off(struct hi846 *hi846)`
	`1659`	`+static int hi846_power_off(struct hi846 *hi846)`
`1660`	`1660`	`{`
`1661`	`1661`	`if (hi846->rst_gpio)`
`1662`	`1662`	`gpiod_set_value_cansleep(hi846->rst_gpio, 1);`
`@@ -1665,7 +1665,7 @@ static void hi846_power_off(struct hi846 *hi846)`
`1665`	`1665`	`gpiod_set_value_cansleep(hi846->shutdown_gpio, 1);`
`1666`	`1666`
`1667`	`1667`	`clk_disable_unprepare(hi846->clock);`
`1668`		`- regulator_bulk_disable(HI846_NUM_SUPPLIES, hi846->supplies);`
	`1668`	`+ return regulator_bulk_disable(HI846_NUM_SUPPLIES, hi846->supplies);`
`1669`	`1669`	`}`
`1670`	`1670`
`1671`	`1671`	`static int __maybe_unused hi846_suspend(struct device *dev)`
`@@ -1677,9 +1677,7 @@ static int __maybe_unused hi846_suspend(struct device *dev)`
`1677`	`1677`	`if (hi846->streaming)`
`1678`	`1678`	`hi846_stop_streaming(hi846);`
`1679`	`1679`
`1680`		`- hi846_power_off(hi846);`
`1681`		`-`
`1682`		`- return 0;`
	`1680`	`+ return hi846_power_off(hi846);`
`1683`	`1681`	`}`
`1684`	`1682`
`1685`	`1683`	`static int __maybe_unused hi846_resume(struct device *dev)`