Skip to content

Commit

Permalink
USB: at91_udc: Additional checks
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Wojtek Kaniewski authored and Greg Kroah-Hartman committed Dec 20, 2006
1 parent 943c441 commit bfb7fb7
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions drivers/usb/gadget/at91_udc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit bfb7fb7

Please sign in to comment.