From 802ab0e5051e72b2484c9915b07d85f1bceb46ae Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 5 Feb 2013 17:48:49 +0000 Subject: [PATCH] --- yaml --- r: 355078 b: refs/heads/master c: c37b387f077c54c5a01fa240dc8448b60bd731c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/extcon/extcon-arizona.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 669864832bdf..726111f87ac5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d9ab708200fefc3ec6e4454c65584d14ce716b0 +refs/heads/master: c37b387f077c54c5a01fa240dc8448b60bd731c1 diff --git a/trunk/drivers/extcon/extcon-arizona.c b/trunk/drivers/extcon/extcon-arizona.c index aeaf217a05ee..d9918421e80b 100644 --- a/trunk/drivers/extcon/extcon-arizona.c +++ b/trunk/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"); }