From 0716db4ab913f76c2fcee7628d08f0853c945158 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Fri, 21 Dec 2012 17:57:12 -0800 Subject: [PATCH] --- yaml --- r: 354630 b: refs/heads/master c: 348409a267e441c46345f325db37e9824fcf675e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/at91_udc.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2c295e0db3b6..4bf99dee0b43 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 32c9cf22fccb371745bde98e1da1c3aeb4bb9f36 +refs/heads/master: 348409a267e441c46345f325db37e9824fcf675e diff --git a/trunk/drivers/usb/gadget/at91_udc.c b/trunk/drivers/usb/gadget/at91_udc.c index f4a21f6f081f..e81d8a223f76 100644 --- a/trunk/drivers/usb/gadget/at91_udc.c +++ b/trunk/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,