From 468052a63ed3a7d4258bbd088a602f0275e81937 Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 27 Nov 2012 16:14:26 +0900 Subject: [PATCH] --- yaml --- r: 354955 b: refs/heads/master c: cd74f7b3b387cbc6153b15c100982bac119af753 h: refs/heads/master i: 354953: c1a7540e80ad5970fc198c2afc72ead7fdaa1378 354951: 094ce9019e8517b1d837d37daed6f4e5f4bd374b v: v3 --- [refs] | 2 +- trunk/drivers/extcon/extcon-arizona.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b3b92f7b8a2a..19ae3cc8f1a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db72e6a1629ab79f5599f21ab19f8eb31137befa +refs/heads/master: cd74f7b3b387cbc6153b15c100982bac119af753 diff --git a/trunk/drivers/extcon/extcon-arizona.c b/trunk/drivers/extcon/extcon-arizona.c index 7dbefe8fe5c2..9e1d104803e7 100644 --- a/trunk/drivers/extcon/extcon-arizona.c +++ b/trunk/drivers/extcon/extcon-arizona.c @@ -85,8 +85,9 @@ static void arizona_extcon_set_mode(struct arizona_extcon_info *info, int mode) { struct arizona *arizona = info->arizona; - gpio_set_value_cansleep(arizona->pdata.micd_pol_gpio, - info->micd_modes[mode].gpio); + if (arizona->pdata.micd_pol_gpio > 0) + gpio_set_value_cansleep(arizona->pdata.micd_pol_gpio, + info->micd_modes[mode].gpio); regmap_update_bits(arizona->regmap, ARIZONA_MIC_DETECT_1, ARIZONA_MICD_BIAS_SRC_MASK, info->micd_modes[mode].bias);