1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index a4b0ce13fa0c..8d7fcbbe6ade 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -471,6 +471,8 @@ static bool compliance_mode_recovery_timer_quirk_check(void)
 
         dmi_product_name = dmi_get_system_info(DMI_PRODUCT_NAME);
         dmi_sys_vendor = dmi_get_system_info(DMI_SYS_VENDOR);
+        if (!dmi_product_name || !dmi_sys_vendor)
+                return false;
 
         if (!(strstr(dmi_sys_vendor, "Hewlett-Packard")))
                 return false;
@@ -888,7 +890,7 @@ int xhci_suspend(struct xhci_hcd *xhci)
         command &= ~CMD_RUN;
         xhci_writel(xhci, command, &xhci->op_regs->command);
         if (handshake(xhci, &xhci->op_regs->status,
-                      STS_HALT, STS_HALT, 100*100)) {
+                      STS_HALT, STS_HALT, XHCI_MAX_HALT_USEC)) {
                 xhci_warn(xhci, "WARN: xHC CMD_RUN timeout\n");
                 spin_unlock_irq(&xhci->lock);
                 return -ETIMEDOUT;