[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20191209110916.29524-1-ckeepax@opensource.cirrus.com>
Date: Mon, 9 Dec 2019 11:09:07 +0000
From: Charles Keepax <ckeepax@...nsource.cirrus.com>
To: <cw00.choi@...sung.com>
CC: <myungjoo.ham@...sung.com>, <patches@...nsource.cirrus.com>,
<linux-kernel@...r.kernel.org>
Subject: [PATCH 01/10] extcon: arizona: Correct clean up if arizona_identify_headphone fails
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@...nsource.cirrus.com>
---
drivers/extcon/extcon-arizona.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index e970134c95fab..79e9a24101823 100644
--- 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);
--
2.11.0
Powered by blists - more mailing lists