summaryrefslogtreecommitdiff
path: root/drivers/extcon
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2016-09-15 13:16:11 +0300
committerKishon Vijay Abraham I <kishon@ti.com>2016-09-15 14:15:20 +0300
commitcb9850d092f7d2c86662d71fbfe10685cbddda21 (patch)
tree77023cbc002680edbe3738f87dc9be413a8b8e68 /drivers/extcon
parent81522637485dd6ec9de4279c9714d58f884b6091 (diff)
parentb78ea84a7d45b9e5ad2eee429a2140065a39d755 (diff)
downloadlinux-cb9850d092f7d2c86662d71fbfe10685cbddda21.tar.xz
Merge branch 'next' into resolution
Conflicts: drivers/extcon/extcon-adc-jack.c drivers/extcon/extcon-arizona.c drivers/extcon/extcon-gpio.c include/linux/extcon.h
Diffstat (limited to 'drivers/extcon')
-rw-r--r--drivers/extcon/extcon-gpio.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/extcon/extcon-gpio.c b/drivers/extcon/extcon-gpio.c
index e7aebbc945f6..ebed22f22d75 100644
--- a/drivers/extcon/extcon-gpio.c
+++ b/drivers/extcon/extcon-gpio.c
@@ -49,6 +49,7 @@ static void gpio_extcon_work(struct work_struct *work)
state = gpiod_get_value_cansleep(data->id_gpiod);
if (data->pdata->gpio_active_low)
state = !state;
+
extcon_set_state_sync(data->edev, data->pdata->extcon_id, state);
}