projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e42617b
)
extcon: arizona: Correct clean up if arizona_identify_headphone fails
author
Charles Keepax
<ckeepax@opensource.cirrus.com>
Mon, 9 Dec 2019 11:09:07 +0000
(11:09 +0000)
committer
Chanwoo Choi
<cw00.choi@samsung.com>
Mon, 9 Dec 2019 11:18:14 +0000
(20:18 +0900)
In the error path of arizona_identify_headphone, neither the clamp nor
the PM runtime are cleaned up. Add calls to clean up both of these.
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
drivers/extcon/extcon-arizona.c
patch
|
blob
|
history
diff --git
a/drivers/extcon/extcon-arizona.c
b/drivers/extcon/extcon-arizona.c
index
e970134
..
79e9a24
100644
(file)
--- a/
drivers/extcon/extcon-arizona.c
+++ b/
drivers/extcon/extcon-arizona.c
@@
-724,6
+724,9
@@
static void arizona_identify_headphone(struct arizona_extcon_info *info)
return;
err:
+ arizona_extcon_hp_clamp(info, false);
+ pm_runtime_put_autosuspend(info->dev);
+
regmap_update_bits(arizona->regmap, ARIZONA_ACCESSORY_DETECT_MODE_1,
ARIZONA_ACCDET_MODE_MASK, ARIZONA_ACCDET_MODE_MIC);