Merge branch 'master' into for-next

[linux-drm-fsl-dcu.git] / drivers / usb / core / message.c

diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c
index 874d1a406ebc3a7e06d2f8ad10448c6786d8265c..5239e51630749aa49b40ef877e211c19a3b503a0 100644 (file)
--- a/drivers/usb/core/message.c
+++ b/drivers/usb/core/message.c
@@ -6,7 +6,6 @@
 #include <linux/usb.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/init.h>
 #include <linux/mm.h>
 #include <linux/timer.h>
 #include <linux/ctype.h>
@@ -218,7 +217,7 @@ EXPORT_SYMBOL_GPL(usb_interrupt_msg);
  *
  * Return:
  * If successful, 0. Otherwise a negative error number. The number of actual
- * bytes transferred will be stored in the @actual_length paramater.
+ * bytes transferred will be stored in the @actual_length parameter.
  *
  */
 int usb_bulk_msg(struct usb_device *usb_dev, unsigned int pipe,
@@ -518,7 +517,7 @@ void usb_sg_wait(struct usb_sg_request *io)
                io->urbs[i]->dev = io->dev;
                retval = usb_submit_urb(io->urbs[i], GFP_ATOMIC);
 
-               /* after we submit, let completions or cancelations fire;
+               /* after we submit, let completions or cancellations fire;
                 * we handshake using io->status.
                 */
                spin_unlock_irq(&io->lock);