USB: wusbcore: correct spelling mistakes in comments and error string

[deliverable/linux.git] / drivers / usb / wusbcore / security.c

diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c
index 4c40d0dbf53d45c35ae5b05798f1f09566ffc29e..c322dca5ee4b890f59f540526b3c43970debe1a8 100644 (file)
--- a/drivers/usb/wusbcore/security.c
+++ b/drivers/usb/wusbcore/security.c
@@ -56,7 +56,7 @@ void wusbhc_sec_destroy(struct wusbhc *wusbhc)
  * @wusb_dev: the device whose PTK the TKID is for
  *            (or NULL for a TKID for a GTK)
  *
- * The generated TKID consist of two parts: the device's authenicated
+ * The generated TKID consists of two parts: the device's authenticated
  * address (or 0 or a GTK); and an incrementing number.  This ensures
  * that TKIDs cannot be shared between devices and by the time the
  * incrementing number wraps around the older TKIDs will no longer be
@@ -165,7 +165,7 @@ static int wusb_dev_set_encryption(struct usb_device *usb_dev, int value)
        result = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),
                        USB_REQ_SET_ENCRYPTION,
                        USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-                       value, 0, NULL, 0, 1000 /* FIXME: arbitrary */);
+                       value, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
        if (result < 0)
                dev_err(dev, "Can't set device's WUSB encryption to "
                        "%s (value %d): %d\n",
@@ -191,7 +191,7 @@ static int wusb_dev_set_gtk(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev)
                USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
                USB_DT_KEY << 8 | key_index, 0,
                &wusbhc->gtk.descr, wusbhc->gtk.descr.bLength,
-               1000);
+               USB_CTRL_SET_TIMEOUT);
 }
 
 
@@ -301,8 +301,9 @@ int wusb_dev_update_address(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev)
 
        /* Set address 0 */
        result = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),
-                                USB_REQ_SET_ADDRESS, 0,
-                                0, 0, NULL, 0, 1000 /* FIXME: arbitrary */);
+                       USB_REQ_SET_ADDRESS,
+                       USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
+                        0, 0, NULL, 0, USB_CTRL_SET_TIMEOUT);
        if (result < 0) {
                dev_err(dev, "auth failed: can't set address 0: %d\n",
                        result);
@@ -316,9 +317,10 @@ int wusb_dev_update_address(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev)
 
        /* Set new (authenticated) address. */
        result = usb_control_msg(usb_dev, usb_sndctrlpipe(usb_dev, 0),
-                                USB_REQ_SET_ADDRESS, 0,
-                                new_address, 0, NULL, 0,
-                                1000 /* FIXME: arbitrary */);
+                       USB_REQ_SET_ADDRESS,
+                       USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
+                       new_address, 0, NULL, 0,
+                       USB_CTRL_SET_TIMEOUT);
        if (result < 0) {
                dev_err(dev, "auth failed: can't set address %u: %d\n",
                        new_address, result);
@@ -381,7 +383,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
                usb_dev, usb_sndctrlpipe(usb_dev, 0),
                USB_REQ_SET_HANDSHAKE,
                USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-               1, 0, &hs[0], sizeof(hs[0]), 1000 /* FIXME: arbitrary */);
+               1, 0, &hs[0], sizeof(hs[0]), USB_CTRL_SET_TIMEOUT);
        if (result < 0) {
                dev_err(dev, "Handshake1: request failed: %d\n", result);
                goto error_hs1;
@@ -392,7 +394,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
                usb_dev, usb_rcvctrlpipe(usb_dev, 0),
                USB_REQ_GET_HANDSHAKE,
                USB_DIR_IN | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-               2, 0, &hs[1], sizeof(hs[1]), 1000 /* FIXME: arbitrary */);
+               2, 0, &hs[1], sizeof(hs[1]), USB_CTRL_GET_TIMEOUT);
        if (result < 0) {
                dev_err(dev, "Handshake2: request failed: %d\n", result);
                goto error_hs2;
@@ -469,7 +471,7 @@ int wusb_dev_4way_handshake(struct wusbhc *wusbhc, struct wusb_dev *wusb_dev,
                usb_dev, usb_sndctrlpipe(usb_dev, 0),
                USB_REQ_SET_HANDSHAKE,
                USB_DIR_OUT | USB_TYPE_STANDARD | USB_RECIP_DEVICE,
-               3, 0, &hs[2], sizeof(hs[2]), 1000 /* FIXME: arbitrary */);
+               3, 0, &hs[2], sizeof(hs[2]), USB_CTRL_SET_TIMEOUT);
        if (result < 0) {
                dev_err(dev, "Handshake3: request failed: %d\n", result);
                goto error_hs3;