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>
This commit is contained in:
Wojtek Kaniewski 2006-12-08 03:26:00 -08:00 committed by Greg Kroah-Hartman
parent 943c441948
commit bfb7fb79e9

View File

@ -955,7 +955,10 @@ static int at91_vbus_session(struct usb_gadget *gadget, int is_active)
// VDBG("vbus %s\n", is_active ? "on" : "off"); // VDBG("vbus %s\n", is_active ? "on" : "off");
local_irq_save(flags); local_irq_save(flags);
udc->vbus = (is_active != 0); udc->vbus = (is_active != 0);
pullup(udc, is_active); if (udc->driver)
pullup(udc, is_active);
else
pullup(udc, 0);
local_irq_restore(flags); local_irq_restore(flags);
return 0; return 0;
} }
@ -1241,7 +1244,10 @@ static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
#undef w_length #undef w_length
/* pass request up to the gadget driver */ /* 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) { if (status < 0) {
stall: stall:
VDBG("req %02x.%02x protocol STALL; stat %d\n", VDBG("req %02x.%02x protocol STALL; stat %d\n",