Merge commit 'origin/master'

[linux-2.6] / drivers / usb / gadget / pxa27x_udc.c

diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c
index 40d6b580f15221b16896a551827703a6c7bf9703..9d447d8cfc0ca560040086056b3630d813c2dc92 100644 (file)
--- a/drivers/usb/gadget/pxa27x_udc.c
+++ b/drivers/usb/gadget/pxa27x_udc.c
@@ -1526,7 +1526,8 @@ static void udc_disable(struct pxa_udc *udc)
 
        ep0_idle(udc);
        udc->gadget.speed = USB_SPEED_UNKNOWN;
-       udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
+       if (udc->mach->udc_command)
+               udc->mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
 }
 
 /**
@@ -1574,7 +1575,6 @@ static void udc_enable(struct pxa_udc *udc)
 {
        udc_writel(udc, UDCICR0, 0);
        udc_writel(udc, UDCICR1, 0);
-       udc_writel(udc, UP2OCR, UP2OCR_HXOE);
        udc_clear_mask_UDCCR(udc, UDCCR_UDE);
 
        clk_enable(udc->clk);
@@ -2367,11 +2367,11 @@ static int pxa_udc_resume(struct platform_device *_dev)
 #endif
 
 /* work with hotplug and coldplug */
-MODULE_ALIAS("platform:pxa2xx-udc");
+MODULE_ALIAS("platform:pxa27x-udc");
 
 static struct platform_driver udc_driver = {
        .driver         = {
-               .name   = "pxa2xx-udc",
+               .name   = "pxa27x-udc",
                .owner  = THIS_MODULE,
        },
        .remove         = __exit_p(pxa_udc_remove),