usb: host: ehci: add missing change from k310

Add missing change from k310 to k318 to
avoid system hang after modem being
enumerated on EHCI HSIC

Bug 200027573

Change-Id: Ia884cbaa1ba292cd278b159dfe5a6e0b193a8d15
Signed-off-by: BH Hsieh <bhsieh@nvidia.com>
Reviewed-on: http://git-master/r/820675
(cherry picked from commit 12ce1fd18b4a3650cbb4cfa28cb3aa5a87dfa2dc)
Reviewed-on: http://git-master/r/1206777
GVS: Gerrit_Virtual_Submit
Reviewed-by: WK Tsai <wtsai@nvidia.com>
Reviewed-by: Ashutosh Jha <ajha@nvidia.com>

diff --git a/drivers/usb/host/ehci-hub.c b/drivers/usb/host/ehci-hub.c
index 2b0258291dc8adaebca7ab8f92ae41b9f72496f1..ea7a09fd62eee5967a58c010509fe82e35b5a1a2 100644 (file)
--- a/drivers/usb/host/ehci-hub.c
+++ b/drivers/usb/host/ehci-hub.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2001-2004 by David Brownell
+ * Copyright (c) 2015, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the
@@ -617,6 +618,10 @@ ehci_hub_status_data (struct usb_hcd *hcd, char *buf)
        unsigned long   flags;
        u32             ppcd = ~0;
 
+       /* if !USB_SUSPEND, root hub timers won't get shut down ... */
+       if (ehci->rh_state != EHCI_RH_RUNNING)
+               return 0;
+
        /* init status to no-changes */
        buf [0] = 0;
        ports = HCS_N_PORTS (ehci->hcs_params);