From: Sarah Sharp <sarah.a.sharp@linux.intel.com>
Date: Fri, 16 Aug 2013 01:00:46 +0000 (-0700)
Subject: Merge tag 'for-usb-2013-08-15-step-1' into for-usb-next
X-Git-Tag: v3.12-rc1~186^2~35^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=5845c13a70b40f1ce4dfe83acb7796bed8a60672;p=linux.git

Merge tag 'for-usb-2013-08-15-step-1' into for-usb-next

xhci: Step 1 to fix usb-linus and usb-next.

Hi Greg,

This is the first of three steps to fix your usb-linus and usb-next
trees.  As I mentioned, commit 4fae6f0fa86f92e6bc7429371b1e177ad0aaac66
"USB: handle LPM errors during device suspend correctly" was incorrectly
added to usb-next when it should have been added to usb-linus and marked
for stable.

Two port power off bug fixes touch the same code that patch touches, but
it's not easy to simply move commit 4fae6f0f patch to usb-linus because
commit 28e861658e23ca94692f98e245d254c75c8088a7 "USB: refactor code for
enabling/disabling remote wakeup" also touched those code sections.

I propose a two step process to fix this:

1. Pull these four patches into usb-linus.

2. Revert commit 28e861658e23ca94692f98e245d254c75c8088a7 from usb-next.
   Merge usb-linus into usb-next, and resolve the conflicts.

I will be sending pull requests for these steps.

This pull request is step one, and contains the backported version of
commit 4fae6f0fa86f92e6bc7429371b1e177ad0aaac66, the two port power off
fixes, and an unrelated xhci-plat bug fix.

Sarah Sharp

Resolved conflicts:
	drivers/usb/core/hub.c
---

5845c13a70b40f1ce4dfe83acb7796bed8a60672
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,ead3555d6dba..ba0ec0a96481
--- 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: