LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v2] extcon: arizona: Correct error handling on regmap_update_bits_check
@ 2019-05-29  9:46 ` Charles Keepax
  2019-05-30  1:05   ` Chanwoo Choi
  0 siblings, 1 reply; 2+ messages in thread
From: Charles Keepax @ 2019-05-29  9:46 UTC (permalink / raw)
  To: cw00.choi; +Cc: myungjoo.ham, patches, linux-kernel

Ensure the case when regmap_update_bits_check fails and the change
variable is not updated is handled correctly.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---

Changes since v1:
 - Print error message in driver remove

Thanks,
Charles

 drivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index 9327479c719c2..519e89aedd4a0 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -335,10 +335,12 @@ static void arizona_start_mic(struct arizona_extcon_info *info)
 
 	arizona_extcon_pulse_micbias(info);
 
-	regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
-				 ARIZONA_MICD_ENA, ARIZONA_MICD_ENA,
-				 &change);
-	if (!change) {
+	ret = regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
+				       ARIZONA_MICD_ENA, ARIZONA_MICD_ENA,
+				       &change);
+	if (ret < 0) {
+		dev_err(arizona->dev, "Failed to enable micd: %d\n", ret);
+	} else if (!change) {
 		regulator_disable(info->micvdd);
 		pm_runtime_put_autosuspend(info->dev);
 	}
@@ -350,12 +352,14 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)
 	const char *widget = arizona_extcon_get_micbias(info);
 	struct snd_soc_dapm_context *dapm = arizona->dapm;
 	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
-	bool change;
+	bool change = false;
 	int ret;
 
-	regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
-				 ARIZONA_MICD_ENA, 0,
-				 &change);
+	ret = regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
+				       ARIZONA_MICD_ENA, 0,
+				       &change);
+	if (ret < 0)
+		dev_err(arizona->dev, "Failed to disable micd: %d\n", ret);
 
 	ret = snd_soc_component_disable_pin(component, widget);
 	if (ret != 0)
@@ -1727,12 +1731,15 @@ static int arizona_extcon_remove(struct platform_device *pdev)
 	struct arizona *arizona = info->arizona;
 	int jack_irq_rise, jack_irq_fall;
 	bool change;
+	int ret;
 
-	regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
-				 ARIZONA_MICD_ENA, 0,
-				 &change);
-
-	if (change) {
+	ret = regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
+				       ARIZONA_MICD_ENA, 0,
+				       &change);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "Failed to disable micd on remove: %d\n",
+			ret);
+	} else if (change) {
 		regulator_disable(info->micvdd);
 		pm_runtime_put(info->dev);
 	}
-- 
2.11.0


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] extcon: arizona: Correct error handling on regmap_update_bits_check
  2019-05-29  9:46 ` [PATCH v2] extcon: arizona: Correct error handling on regmap_update_bits_check Charles Keepax
@ 2019-05-30  1:05   ` Chanwoo Choi
  0 siblings, 0 replies; 2+ messages in thread
From: Chanwoo Choi @ 2019-05-30  1:05 UTC (permalink / raw)
  To: Charles Keepax; +Cc: myungjoo.ham, patches, linux-kernel

Hi Charles,

On 19. 5. 29. 오후 6:46, Charles Keepax wrote:
> Ensure the case when regmap_update_bits_check fails and the change
> variable is not updated is handled correctly.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> ---
> 
> Changes since v1:
>  - Print error message in driver remove
> 
> Thanks,
> Charles
> 
>  drivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++-------------
>  1 file changed, 20 insertions(+), 13 deletions(-)
> 
> diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
> index 9327479c719c2..519e89aedd4a0 100644
> --- a/drivers/extcon/extcon-arizona.c
> +++ b/drivers/extcon/extcon-arizona.c
> @@ -335,10 +335,12 @@ static void arizona_start_mic(struct arizona_extcon_info *info)
>  
>  	arizona_extcon_pulse_micbias(info);
>  
> -	regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
> -				 ARIZONA_MICD_ENA, ARIZONA_MICD_ENA,
> -				 &change);
> -	if (!change) {
> +	ret = regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
> +				       ARIZONA_MICD_ENA, ARIZONA_MICD_ENA,
> +				       &change);
> +	if (ret < 0) {
> +		dev_err(arizona->dev, "Failed to enable micd: %d\n", ret);
> +	} else if (!change) {
>  		regulator_disable(info->micvdd);
>  		pm_runtime_put_autosuspend(info->dev);
>  	}
> @@ -350,12 +352,14 @@ static void arizona_stop_mic(struct arizona_extcon_info *info)
>  	const char *widget = arizona_extcon_get_micbias(info);
>  	struct snd_soc_dapm_context *dapm = arizona->dapm;
>  	struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
> -	bool change;
> +	bool change = false;
>  	int ret;
>  
> -	regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
> -				 ARIZONA_MICD_ENA, 0,
> -				 &change);
> +	ret = regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
> +				       ARIZONA_MICD_ENA, 0,
> +				       &change);
> +	if (ret < 0)
> +		dev_err(arizona->dev, "Failed to disable micd: %d\n", ret);
>  
>  	ret = snd_soc_component_disable_pin(component, widget);
>  	if (ret != 0)
> @@ -1727,12 +1731,15 @@ static int arizona_extcon_remove(struct platform_device *pdev)
>  	struct arizona *arizona = info->arizona;
>  	int jack_irq_rise, jack_irq_fall;
>  	bool change;
> +	int ret;
>  
> -	regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
> -				 ARIZONA_MICD_ENA, 0,
> -				 &change);
> -
> -	if (change) {
> +	ret = regmap_update_bits_check(arizona->regmap, ARIZONA_MIC_DETECT_1,
> +				       ARIZONA_MICD_ENA, 0,
> +				       &change);
> +	if (ret < 0) {
> +		dev_err(&pdev->dev, "Failed to disable micd on remove: %d\n",
> +			ret);
> +	} else if (change) {
>  		regulator_disable(info->micvdd);
>  		pm_runtime_put(info->dev);
>  	}
> 

Applied it. Thanks.

-- 
Best Regards,
Chanwoo Choi
Samsung Electronics

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-05-30  1:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
     [not found] <CGME20190529094610epcas5p35754e16753663dfa2ecadf0e410d619a@epcas5p3.samsung.com>
2019-05-29  9:46 ` [PATCH v2] extcon: arizona: Correct error handling on regmap_update_bits_check Charles Keepax
2019-05-30  1:05   ` Chanwoo Choi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).