Commit e6e8ac441cd2c1fed16f1864b170d9d471aeb7fe
Exists in
master
and in
20 other branches
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
Showing 4 changed files Side-by-side Diff
MAINTAINERS
| ... | ... | @@ -8669,6 +8669,11 @@ |
| 8669 | 8669 | S: Maintained |
| 8670 | 8670 | F: sound/usb/midi.* |
| 8671 | 8671 | |
| 8672 | +USB NETWORKING DRIVERS | |
| 8673 | +L: linux-usb@vger.kernel.org | |
| 8674 | +S: Odd Fixes | |
| 8675 | +F: drivers/net/usb/ | |
| 8676 | + | |
| 8672 | 8677 | USB OHCI DRIVER |
| 8673 | 8678 | M: Alan Stern <stern@rowland.harvard.edu> |
| 8674 | 8679 | L: linux-usb@vger.kernel.org |
drivers/usb/core/hub.c
| ... | ... | @@ -4798,7 +4798,8 @@ |
| 4798 | 4798 | hub->ports[i - 1]->child; |
| 4799 | 4799 | |
| 4800 | 4800 | dev_dbg(hub_dev, "warm reset port %d\n", i); |
| 4801 | - if (!udev) { | |
| 4801 | + if (!udev || !(portstatus & | |
| 4802 | + USB_PORT_STAT_CONNECTION)) { | |
| 4802 | 4803 | status = hub_port_reset(hub, i, |
| 4803 | 4804 | NULL, HUB_BH_RESET_TIME, |
| 4804 | 4805 | true); |
| 4805 | 4806 | |
| ... | ... | @@ -4808,8 +4809,8 @@ |
| 4808 | 4809 | usb_lock_device(udev); |
| 4809 | 4810 | status = usb_reset_device(udev); |
| 4810 | 4811 | usb_unlock_device(udev); |
| 4812 | + connect_change = 0; | |
| 4811 | 4813 | } |
| 4812 | - connect_change = 0; | |
| 4813 | 4814 | } |
| 4814 | 4815 | |
| 4815 | 4816 | if (connect_change) |
drivers/usb/host/xhci-mem.c