diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-16 07:10:27 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-06-16 07:10:27 (GMT) |
| commit | d74ef24841a972a9abe3742a7eff51cdac73db3a (patch) | |
| tree | dc2eef751dc5d214d0fd73f19d0b36218d2cf6e3 /drivers | |
| parent | 4d2ec8575357d4afc965564e2e910a72fe608d39 (diff) | |
| parent | 62e6d1e59c77316768a663d1328390b4cd33801f (diff) | |
| download | linux-d74ef24841a972a9abe3742a7eff51cdac73db3a.tar.xz | |
Merge tag 'extcon-fixes-for-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus
Chanwoo writes:
Update extcon for v4.7-rc4
This patch fixes the following issue:
- In the extcon-palmas.c, fix the state of VBUS when using GPIO detection.
If probe funticon don't check the state during probe, the extcon client
driver cannot get the state of VBUS gpio until the user detach the connector
and attach the connector again.
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/extcon/extcon-palmas.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/extcon/extcon-palmas.c b/drivers/extcon/extcon-palmas.c index 8b3226d..caff46c 100644 --- a/drivers/extcon/extcon-palmas.c +++ b/drivers/extcon/extcon-palmas.c @@ -360,6 +360,8 @@ static int palmas_usb_probe(struct platform_device *pdev) palmas_enable_irq(palmas_usb); /* perform initial detection */ + if (palmas_usb->enable_gpio_vbus_detection) + palmas_vbus_irq_handler(palmas_usb->gpio_vbus_irq, palmas_usb); palmas_gpio_id_detect(&palmas_usb->wq_detectid.work); device_set_wakeup_capable(&pdev->dev, true); return 0; |