From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 19 Aug 2013 03:33:01 +0000 (-0700)
Subject: Merge 3.11-rc6 into usb-next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bd479f293370d863953aba59130bcc7ae867dd10;p=deliverable%2Flinux.git

Merge 3.11-rc6 into usb-next

We want these USB fixes in this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

bd479f293370d863953aba59130bcc7ae867dd10
diff --cc drivers/usb/host/xhci-mem.c
index b150360d1e78,6f8c2fd47675..53b972c2a09f
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@@ -24,9 -24,9 +24,10 @@@
  #include <linux/pci.h>
  #include <linux/slab.h>
  #include <linux/dmapool.h>
+ #include <linux/dma-mapping.h>
  
  #include "xhci.h"
 +#include "xhci-trace.h"
  
  /*
   * Allocates a generic ring segment from the ring pool, sets the dma address,
diff --cc drivers/usb/host/xhci.c
index 7299b591a341,9478caa2f71f..bf11af9a4699
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@@ -27,9 -27,9 +27,10 @@@
  #include <linux/moduleparam.h>
  #include <linux/slab.h>
  #include <linux/dmi.h>
+ #include <linux/dma-mapping.h>
  
  #include "xhci.h"
 +#include "xhci-trace.h"
  
  #define DRIVER_AUTHOR "Sarah Sharp"
  #define DRIVER_DESC "'eXtensible' Host Controller (xHC) Driver"
diff --cc drivers/usb/misc/adutux.c
index 7078e9bf0fc0,eeb27208c0d1..3eaa83f05086
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@@ -783,9 -830,11 +783,9 @@@ static int adu_probe(struct usb_interfa
  
  	/* let the user know what node this device is now attached to */
  	dev_info(&interface->dev, "ADU%d %s now attached to /dev/usb/adutux%d\n",
- 		 udev->descriptor.idProduct, dev->serial_number,
+ 		 le16_to_cpu(udev->descriptor.idProduct), dev->serial_number,
  		 (dev->minor - ADU_MINOR_BASE));
  exit:
 -	dbg(2, " %s : leave, return value %p (dev)", __func__, dev);
 -
  	return retval;
  
  error: