usb: check usb_hub_to_struct_hub() return value

usb_hub_to_struct_hub() can return NULL in some unlikely cases.
Add checks where appropriate, or pass the hub pointer as an additional
argument if it's known to be valid.

The places it makes sense to check usb_hub_to_struct_hub()
are picked based on feedback from Alan Stern.

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/usb/core/port.c b/drivers/usb/core/port.c
index b8bad294eeb8..5fd3fee58f8b 100644
--- a/drivers/usb/core/port.c
+++ b/drivers/usb/core/port.c
@@ -86,7 +86,7 @@ static int usb_port_runtime_resume(struct device *dev)
         usb_autopm_get_interface(intf);
         set_bit(port1, hub->busy_bits);
 
-        retval = usb_hub_set_port_power(hdev, port1, true);
+        retval = usb_hub_set_port_power(hdev, hub, port1, true);
         if (port_dev->child && !retval) {
                 /*
                  * Wait for usb hub port to be reconnected in order to make
@@ -128,7 +128,7 @@ static int usb_port_runtime_suspend(struct device *dev)
 
         usb_autopm_get_interface(intf);
         set_bit(port1, hub->busy_bits);
-        retval = usb_hub_set_port_power(hdev, port1, false);
+        retval = usb_hub_set_port_power(hdev, hub, port1, false);
         usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_CONNECTION);
         usb_clear_port_feature(hdev, port1,     USB_PORT_FEAT_C_ENABLE);
         clear_bit(port1, hub->busy_bits);