From: Marek Vasut Date: Mon, 13 Feb 2012 18:58:18 +0000 (+0000) Subject: USB: Make struct devrequest setup_packet local X-Git-Tag: v2012.04-rc1~95 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e159e4868ec1c289a7c167da681165e74308c92a;p=u-boot USB: Make struct devrequest setup_packet local Signed-off-by: Marek Vasut Cc: Remy Bohmer Acked-by: Mike Frysinger --- diff --git a/common/usb.c b/common/usb.c index 81dcbe2811..3c9ede4b8e 100644 --- a/common/usb.c +++ b/common/usb.c @@ -73,7 +73,6 @@ static struct usb_device usb_dev[USB_MAX_DEVICE]; static int dev_index; static int running; static int asynch_allowed; -static struct devrequest setup_packet; char usb_started; /* flag for the started/stopped USB status */ @@ -180,6 +179,8 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, unsigned short value, unsigned short index, void *data, unsigned short size, int timeout) { + struct devrequest setup_packet; + if ((timeout == 0) && (!asynch_allowed)) { /* request for a asynch control pipe is not allowed */ return -1;