diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-05 17:48:49 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-11 16:06:25 +0000 |
| commit | c37b387f077c54c5a01fa240dc8448b60bd731c1 (patch) | |
| tree | 9d6b15e5e6a557288e5b487ed3c50bf1570c0db0 /drivers/extcon | |
| parent | 5d9ab708200fefc3ec6e4454c65584d14ce716b0 (diff) | |
| download | linux-3.10-c37b387f077c54c5a01fa240dc8448b60bd731c1.tar.gz linux-3.10-c37b387f077c54c5a01fa240dc8448b60bd731c1.tar.bz2 linux-3.10-c37b387f077c54c5a01fa240dc8448b60bd731c1.zip | |
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>
Diffstat (limited to 'drivers/extcon')
| -rw-r--r-- | drivers/extcon/extcon-arizona.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index aeaf217a05e..d9918421e80 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"); } |