summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-11-28 13:00:57 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2017-11-28 13:00:56 -0800
commit5ae2acd95cfb47d0b301cb0fc86b1ac7c7d895d2 (patch)
treee455dc78ca1a929562c3fa4a5b6128e482e9e9eb
parent2e22873571a7e0d6b8e9f54943de851598c8863c (diff)
parent7b3d4391194bfbdfd343040c11bad376d84e11f6 (diff)
Merge "platform: msm: Set USB speed to SUPER before calling notifier"
-rw-r--r--drivers/platform/msm/gpio-usbdetect.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/platform/msm/gpio-usbdetect.c b/drivers/platform/msm/gpio-usbdetect.c
index adf47fc32548..1628253fb545 100644
--- a/drivers/platform/msm/gpio-usbdetect.c
+++ b/drivers/platform/msm/gpio-usbdetect.c
@@ -49,8 +49,8 @@ static irqreturn_t gpio_usbdetect_vbus_irq(int irq, void *data)
usb->vbus_state = gpio_get_value(usb->gpio);
if (usb->vbus_state) {
dev_dbg(&usb->pdev->dev, "setting vbus notification\n");
- extcon_set_cable_state_(usb->extcon_dev, EXTCON_USB, 1);
extcon_set_cable_state_(usb->extcon_dev, EXTCON_USB_SPEED, 1);
+ extcon_set_cable_state_(usb->extcon_dev, EXTCON_USB, 1);
} else {
dev_dbg(&usb->pdev->dev, "setting vbus removed notification\n");
extcon_set_cable_state_(usb->extcon_dev, EXTCON_USB, 0);
@@ -85,8 +85,8 @@ static irqreturn_t gpio_usbdetect_id_irq_thread(int irq, void *data)
} else {
dev_dbg(&usb->pdev->dev, "starting usb HOST\n");
disable_irq(usb->vbus_det_irq);
- extcon_set_cable_state_(usb->extcon_dev, EXTCON_USB_HOST, 1);
extcon_set_cable_state_(usb->extcon_dev, EXTCON_USB_SPEED, 1);
+ extcon_set_cable_state_(usb->extcon_dev, EXTCON_USB_HOST, 1);
}
return IRQ_HANDLED;
}