extcon: arizona: Correct error handling on regmap_update_bits_check
PATCH v2 1/1 extcon: arizona: Correct error handling on regmap_update_bits_check
Ensure the case when regmap_update_bits_check fails and the change variable is not updated is handled correctly.
Signed-off-by Charles Keepax <[email protected]>
---
Changes since v1:
- Print error message in driver remove
Thanks,
Charles
drivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)
drivers/extcon/extcon-arizona.c +20 -13
@@ -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); }
Signature · 1 line
2.11.0
Hi Charles,
Quoted 67 lines · Charles Keepax
Ensure the case when
regmap_update_bits_checkfails and the change variable is not updated is handled correctly.Signed-off-by Charles Keepax <[email protected]>---
Changes since v1:
- Print error message in driver removeThanks,
Charlesdrivers/extcon/extcon-arizona.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)drivers/extcon/extcon-arizona.c +13
-13@@ -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) {
drivers/extcon/extcon-arizona.c static int arizona_extcon_remove(struct platform_device *pdev) · line 1745
Quoted 10 lines
drivers/extcon/extcon-arizona.c +7
-0+ 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.
Signature · 3 lines
Best Regards, Chanwoo Choi Samsung Electronics