Merge tag 'usb-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

[linux-beck.git] / drivers / usb / gadget / at91_udc.c

diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
index 0143ffa4e409f809319f547c093a0b58154f309c..45dd2929a6710227fc13761503177774153539a8 100644 (file)
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@ -1621,8 +1621,7 @@ static void at91_vbus_timer(unsigned long data)
         * bus such as i2c or spi which may sleep, so schedule some work
         * to read the vbus gpio
         */
-       if (!work_pending(&udc->vbus_timer_work))
-               schedule_work(&udc->vbus_timer_work);
+       schedule_work(&udc->vbus_timer_work);
 }
 
 static int at91_start(struct usb_gadget *gadget,
@@ -1739,7 +1738,7 @@ static int at91udc_probe(struct platform_device *pdev)
 
        /* rm9200 needs manual D+ pullup; off by default */
        if (cpu_is_at91rm9200()) {
-               if (gpio_is_valid(udc->board.pullup_pin)) {
+               if (!gpio_is_valid(udc->board.pullup_pin)) {
                        DBG("no D+ pullup?\n");
                        retval = -ENODEV;
                        goto fail0;