diff options
| author | Kishon Vijay Abraham I | 2016-09-15 12:16:11 +0200 |
|---|---|---|
| committer | Kishon Vijay Abraham I | 2016-09-15 13:15:20 +0200 |
| commit | cb9850d092f7d2c86662d71fbfe10685cbddda21 (patch) | |
| tree | 77023cbc002680edbe3738f87dc9be413a8b8e68 /drivers/extcon/extcon-gpio.c | |
| parent | Merge tag 'usb-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bal... (diff) | |
| parent | phy-twl4030-usb: initialize charging-related stuff via pm_runtime (diff) | |
| download | kernel-qcow2-linux-cb9850d092f7d2c86662d71fbfe10685cbddda21.tar.gz kernel-qcow2-linux-cb9850d092f7d2c86662d71fbfe10685cbddda21.tar.xz kernel-qcow2-linux-cb9850d092f7d2c86662d71fbfe10685cbddda21.zip | |
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/extcon-gpio.c')
| -rw-r--r-- | drivers/extcon/extcon-gpio.c | 1 |
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); } |