diff options
| author | Marek Vasut <marek.vasut@gmail.com> | 2012-02-13 18:58:18 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-03-03 16:55:54 +0100 |
| commit | e159e4868ec1c289a7c167da681165e74308c92a (patch) | |
| tree | 56e452020ef5497db755866788299f7d4054d124 /common/usb.c | |
| parent | 23faf2bc9e80e3ee2c06a3a61bb8a02e43a97097 (diff) | |
| download | talos-obmc-uboot-e159e4868ec1c289a7c167da681165e74308c92a.tar.gz talos-obmc-uboot-e159e4868ec1c289a7c167da681165e74308c92a.zip | |
USB: Make struct devrequest setup_packet local
Signed-off-by: Marek Vasut <marek.vasut@gmail.com>
Cc: Remy Bohmer <linux@bohmer.net>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'common/usb.c')
| -rw-r--r-- | common/usb.c | 3 |
1 files changed, 2 insertions, 1 deletions
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; |
