Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / drivers / usb / gadget / pxa25x_udc.c

diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c
index 031dceb93023bbc96b033b88a21881428a22ec5e..8fb0066609bb4a9db0e22a045e70b14909cc809c 100644 (file)
--- a/drivers/usb/gadget/pxa25x_udc.c
+++ b/drivers/usb/gadget/pxa25x_udc.c
@@ -152,9 +152,10 @@ static int is_vbus_present(void)
 static void pullup_off(void)
 {
        struct pxa2xx_udc_mach_info             *mach = the_controller->mach;
+       int off_level = mach->gpio_pullup_inverted;
 
        if (mach->gpio_pullup)
-               gpio_set_value(mach->gpio_pullup, 0);
+               gpio_set_value(mach->gpio_pullup, off_level);
        else if (mach->udc_command)
                mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT);
 }
@@ -162,9 +163,10 @@ static void pullup_off(void)
 static void pullup_on(void)
 {
        struct pxa2xx_udc_mach_info             *mach = the_controller->mach;
+       int on_level = !mach->gpio_pullup_inverted;
 
        if (mach->gpio_pullup)
-               gpio_set_value(mach->gpio_pullup, 1);
+               gpio_set_value(mach->gpio_pullup, on_level);
        else if (mach->udc_command)
                mach->udc_command(PXA2XX_UDC_CMD_CONNECT);
 }
@@ -1818,7 +1820,7 @@ pxa25x_udc_irq(int irq, void *_dev)
 
 static void nop_release (struct device *dev)
 {
-       DMSG("%s %s\n", __func__, dev->bus_id);
+       DMSG("%s %s\n", __func__, dev_name(dev));
 }
 
 /* this uses load-time allocation and initialization (instead of