From: Mark Brown Date: Tue, 5 Feb 2013 17:48:49 +0000 (+0000) Subject: extcon: arizona: Always take the first HPDET reading as the final one X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c37b387f077c54c5a01fa240dc8448b60bd731c1;p=linux-beck.git 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 --- diff --git a/drivers/extcon/extcon-arizona.c b/drivers/extcon/extcon-arizona.c index aeaf217a05ee..d9918421e80b 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"); }