diff options
| author |   Wojtek Kaniewski <wojtekka@toxygen.net> | 2006-12-08 03:26:00 -0800 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2006-12-20 10:14:27 -0800 |
| commit | bfb7fb79e913f60330037d1f302efee28d5f6770 (patch) | |
| tree | e5c0fb70b4f7e57372baccc94bbef00e64e69146 /drivers | |
| parent | USB: at91_udc: Cleanup variables after failure in usb_gadget_register_driver() (diff) | |
| download | linux-dev-bfb7fb79e913f60330037d1f302efee28d5f6770.tar.xz linux-dev-bfb7fb79e913f60330037d1f302efee28d5f6770.zip | |
USB: at91_udc: Additional checks
This patch performs additional checks in at91_udc, just in case of
some spurious interrupts or device enumeration.
Signed-off-by: Wojtek Kaniewski <wojtekka@toxygen.net>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/gadget/at91_udc.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 1926d39e4801..812c733ba8ce 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c @@ -955,7 +955,10 @@ static int at91_vbus_session(struct usb_gadget *gadget, int is_active) // VDBG("vbus %s\n", is_active ? "on" : "off"); local_irq_save(flags); udc->vbus = (is_active != 0); - pullup(udc, is_active); + if (udc->driver) + pullup(udc, is_active); + else + pullup(udc, 0); local_irq_restore(flags); return 0; } @@ -1241,7 +1244,10 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr) #undef w_length /* pass request up to the gadget driver */ - status = udc->driver->setup(&udc->gadget, &pkt.r); + if (udc->driver) + status = udc->driver->setup(&udc->gadget, &pkt.r); + else + status = -ENODEV; if (status < 0) { stall: VDBG("req %02x.%02x protocol STALL; stat %d\n", |