Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6e8ac44 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -8669,6 +8669,11 @@ T: git git://git.alsa-project.org/alsa-kernel.git 
S:	Maintained

F:	sound/usb/midi.*



USB NETWORKING DRIVERS

L:	linux-usb@vger.kernel.org

S:	Odd Fixes

F:	drivers/net/usb/



USB OHCI DRIVER

M:	Alan Stern <stern@rowland.harvard.edu>

L:	linux-usb@vger.kernel.org

drivers/usb/core/hub.c

+3 −2
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/moduleparam.h>

#include <linux/slab.h>

#include <linux/dmi.h>

#include <linux/dma-mapping.h>



#include "xhci.h"