diff options
Diffstat (limited to 'drivers/usb/gadget/pxa25x_udc.c')
-rw-r--r-- | drivers/usb/gadget/pxa25x_udc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/gadget/pxa25x_udc.c b/drivers/usb/gadget/pxa25x_udc.c index 031dceb93023..8fb0066609bb 100644 --- a/drivers/usb/gadget/pxa25x_udc.c +++ b/drivers/usb/gadget/pxa25x_udc.c | |||
@@ -152,9 +152,10 @@ static int is_vbus_present(void) | |||
152 | static void pullup_off(void) | 152 | static void pullup_off(void) |
153 | { | 153 | { |
154 | struct pxa2xx_udc_mach_info *mach = the_controller->mach; | 154 | struct pxa2xx_udc_mach_info *mach = the_controller->mach; |
155 | int off_level = mach->gpio_pullup_inverted; | ||
155 | 156 | ||
156 | if (mach->gpio_pullup) | 157 | if (mach->gpio_pullup) |
157 | gpio_set_value(mach->gpio_pullup, 0); | 158 | gpio_set_value(mach->gpio_pullup, off_level); |
158 | else if (mach->udc_command) | 159 | else if (mach->udc_command) |
159 | mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT); | 160 | mach->udc_command(PXA2XX_UDC_CMD_DISCONNECT); |
160 | } | 161 | } |
@@ -162,9 +163,10 @@ static void pullup_off(void) | |||
162 | static void pullup_on(void) | 163 | static void pullup_on(void) |
163 | { | 164 | { |
164 | struct pxa2xx_udc_mach_info *mach = the_controller->mach; | 165 | struct pxa2xx_udc_mach_info *mach = the_controller->mach; |
166 | int on_level = !mach->gpio_pullup_inverted; | ||
165 | 167 | ||
166 | if (mach->gpio_pullup) | 168 | if (mach->gpio_pullup) |
167 | gpio_set_value(mach->gpio_pullup, 1); | 169 | gpio_set_value(mach->gpio_pullup, on_level); |
168 | else if (mach->udc_command) | 170 | else if (mach->udc_command) |
169 | mach->udc_command(PXA2XX_UDC_CMD_CONNECT); | 171 | mach->udc_command(PXA2XX_UDC_CMD_CONNECT); |
170 | } | 172 | } |
@@ -1818,7 +1820,7 @@ pxa25x_udc_irq(int irq, void *_dev) | |||
1818 | 1820 | ||
1819 | static void nop_release (struct device *dev) | 1821 | static void nop_release (struct device *dev) |
1820 | { | 1822 | { |
1821 | DMSG("%s %s\n", __func__, dev->bus_id); | 1823 | DMSG("%s %s\n", __func__, dev_name(dev)); |
1822 | } | 1824 | } |
1823 | 1825 | ||
1824 | /* this uses load-time allocation and initialization (instead of | 1826 | /* this uses load-time allocation and initialization (instead of |