These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / usb / gadget / udc / pxa27x_udc.c

diff --git a/kernel/drivers/usb/gadget/udc/pxa27x_udc.c b/kernel/drivers/usb/gadget/udc/pxa27x_udc.c
index b51226a..001a3b7 100644 (file)
--- a/kernel/drivers/usb/gadget/udc/pxa27x_udc.c
+++ b/kernel/drivers/usb/gadget/udc/pxa27x_udc.c
@@ -1710,6 +1710,7 @@ static void udc_init_data(struct pxa_udc *dev)
        INIT_LIST_HEAD(&dev->gadget.ep_list);
        INIT_LIST_HEAD(&dev->gadget.ep0->ep_list);
        dev->udc_usb_ep[0].pxa_ep = &dev->pxa_ep[0];
+       dev->gadget.quirk_altset_not_supp = 1;
        ep0_idle(dev);
 
        /* PXA endpoints init */
@@ -2422,7 +2423,7 @@ static int pxa_udc_probe(struct platform_device *pdev)
                }
                udc->udc_command = mach->udc_command;
        } else {
-               udc->gpiod = devm_gpiod_get(&pdev->dev, NULL);
+               udc->gpiod = devm_gpiod_get(&pdev->dev, NULL, GPIOD_ASIS);
        }
 
        regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2535,6 +2536,9 @@ static int pxa_udc_suspend(struct platform_device *_dev, pm_message_t state)
        udc->pullup_resume = udc->pullup_on;
        dplus_pullup(udc, 0);
 
+       if (udc->driver)
+               udc->driver->disconnect(&udc->gadget);
+
        return 0;
 }