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

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);
 }