diff options
| author | Greg Kroah-Hartman | 2019-04-01 07:42:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2019-04-01 07:42:04 +0200 |
| commit | 8cdfd068c1ea54cca7d7ad6ad31335cc5d0d9905 (patch) | |
| tree | 26a36ec23067a9e26baf3d46c65f70619ca4d808 /drivers/usb/common | |
| parent | 4d537f37e0d39f64687be71087dca607ee507f5a (diff) | |
| parent | 79a3aaa7b82e3106be97842dedfd8429248896e6 (diff) | |
Merge 5.1-rc3 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/common')
| -rw-r--r-- | drivers/usb/common/common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c index 2174dd9ec176..18f5dcf58b0d 100644 --- a/drivers/usb/common/common.c +++ b/drivers/usb/common/common.c @@ -161,6 +161,8 @@ enum usb_dr_mode of_usb_get_dr_mode_by_phy(struct device_node *np, int arg0) do { controller = of_find_node_with_property(controller, "phys"); + if (!of_device_is_available(controller)) + continue; index = 0; do { if (arg0 == -1) { |