Commit e6e8ac44 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'usb-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb

Pull USB fixes from Greg KH:
 "Here are 3 small USB fixes for 3.11-rc5.

  One is a fix that the ChromeOS developers ran into on some Intel
  hardware, one is a build fix, and the last is a MAINTAINERS update to
  help people figure out where to send USB network driver patches.

  All of these have been in linux-next for a while"

* tag 'usb-3.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  MAINTAINERS: Add separate section for USB NETWORKING DRIVERS
  usb: xhci: add missing dma-mapping.h includes
  usb: core: don't try to reset_device() a port that got just disconnected
parents 14e94194 444ce9d4
...@@ -8669,6 +8669,11 @@ T: git git://git.alsa-project.org/alsa-kernel.git ...@@ -8669,6 +8669,11 @@ T: git git://git.alsa-project.org/alsa-kernel.git
S: Maintained S: Maintained
F: sound/usb/midi.* F: sound/usb/midi.*
USB NETWORKING DRIVERS
L: linux-usb@vger.kernel.org
S: Odd Fixes
F: drivers/net/usb/
USB OHCI DRIVER USB OHCI DRIVER
M: Alan Stern <stern@rowland.harvard.edu> M: Alan Stern <stern@rowland.harvard.edu>
L: linux-usb@vger.kernel.org L: linux-usb@vger.kernel.org
......
...@@ -4798,7 +4798,8 @@ static void hub_events(void) ...@@ -4798,7 +4798,8 @@ static void hub_events(void)
hub->ports[i - 1]->child; hub->ports[i - 1]->child;
dev_dbg(hub_dev, "warm reset port %d\n", i); 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, status = hub_port_reset(hub, i,
NULL, HUB_BH_RESET_TIME, NULL, HUB_BH_RESET_TIME,
true); true);
...@@ -4808,9 +4809,9 @@ static void hub_events(void) ...@@ -4808,9 +4809,9 @@ static void hub_events(void)
usb_lock_device(udev); usb_lock_device(udev);
status = usb_reset_device(udev); status = usb_reset_device(udev);
usb_unlock_device(udev); usb_unlock_device(udev);
}
connect_change = 0; connect_change = 0;
} }
}
if (connect_change) if (connect_change)
hub_port_connect_change(hub, i, hub_port_connect_change(hub, i,
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dmapool.h> #include <linux/dmapool.h>
#include <linux/dma-mapping.h>
#include "xhci.h" #include "xhci.h"
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/dma-mapping.h>
#include "xhci.h" #include "xhci.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment