extcon: arizona: Always take the first HPDET reading as the final one

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

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c
index aeaf217a05eeccfd84cf9c7196d02249c225ea65..d9918421e80b264887e60fb0bbcedd00b93d045d 100644 (file)
--- 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");
                }