This should always be the most accurate reading for supported accessory
configurations.

Signed-off-by: Mark Brown <broo...@opensource.wolfsonmicro.com>
---
 drivers/extcon/extcon-arizona.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index aeaf217..d991842 100644
--- a/drivers/extcon/extcon-arizona.c
+++ b/drivers/extcon/extcon-arizona.c
@@ -451,6 +451,10 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info 
*info, int *reading)
                        info->hpdet_res[0], info->hpdet_res[1],
                        info->hpdet_res[2]);
 
+
+               /* Take the headphone impedance for the main report */
+               *reading = info->hpdet_res[0];
+
                /*
                 * Either the two grounds measure differently or we
                 * measure the mic as high impedance.
@@ -466,9 +470,6 @@ static int arizona_hpdet_do_id(struct arizona_extcon_info 
*info, int *reading)
                                dev_err(arizona->dev,
                                        "Failed to report mic: %d\n", ret);
                        }
-
-                       /* Take the headphone impedance for the main report */
-                       *reading = info->hpdet_res[1];
                } else {
                        dev_dbg(arizona->dev, "Detected headphone\n");
                }
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to