From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 16 Dec 2013 16:46:03 +0000 (-0800)
Subject: Merge branch 3.13-rc4 into usb-next
X-Git-Tag: v3.14-rc1~148^2~130
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d59abb9325ae5eb8fd28440d80f820b945887541;p=~emulex%2Finfiniband.git

Merge branch 3.13-rc4 into usb-next
---

d59abb9325ae5eb8fd28440d80f820b945887541
diff --cc drivers/usb/wusbcore/security.c
index 4c40d0dbf53,66655e8f230..790c0b5c354
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@@ -189,9 -190,9 +189,9 @@@ static int wusb_dev_set_gtk(struct wusb
  		usb_dev, usb_sndctrlpipe(usb_dev, 0),
  		USB_REQ_SET_DESCRIPTOR,
  		USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
 -		USB_DT_KEY << 8 | wusbhc->gtk_index, 0,
 +		USB_DT_KEY << 8 | key_index, 0,
  		&wusbhc->gtk.descr, wusbhc->gtk.descr.bLength,
- 		1000);
+ 		USB_CTRL_SET_TIMEOUT);
  }