Merge tag 'for-usb-linus-2013-07-31' of...

Merge tag 'for-usb-linus-2013-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci into usb-linus

Sarah writes:

xhci: Misc bug fixes for 3.11.

Hi Greg,

Here's two small fixes for 3.11.  The first patch fixes a 5 second hang in
khubd after a USB device disconnect on some xHCI hosts.  The second fixes a
build warning.

Sarah Sharp

drivers/usb/core/hub.c

@@ -4798,7 +4798,8 @@ static void hub_events(void)
 					hub->ports[i - 1]->child;
 
 				dev_dbg(hub_dev, "warm reset port %d\n", i);
-				if (!udev) {
+				if (!udev || !(portstatus &
+						USB_PORT_STAT_CONNECTION)) {
 					status = hub_port_reset(hub, i,
 							NULL, HUB_BH_RESET_TIME,
 							true);
@@ -4808,9 +4809,9 @@ static void hub_events(void)
 					usb_lock_device(udev);
 					status = usb_reset_device(udev);
 					usb_unlock_device(udev);
-				}
 					connect_change = 0;
 				}
+			}
 
 			if (connect_change)
 				hub_port_connect_change(hub, i,

drivers/usb/host/xhci-mem.c

@@ -24,6 +24,7 @@
 #include <linux/pci.h>
 #include <linux/slab.h>
 #include <linux/dmapool.h>
+#include <linux/dma-mapping.h>
 
 #include "xhci.h"
 

drivers/usb/host/xhci.c

@@ -27,6 +27,7 @@
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
 #include <linux/dmi.h>
+#include <linux/dma-mapping.h>
 
 #include "xhci.h"