summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis R. Cortes <alexis.cortes@ti.com>2012-11-08 16:59:27 -0600
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-01-11 09:06:57 -0800
commit4b2e61048c2c51882dc268dc2916a5b3bfab00ea (patch)
tree3e7fbcb63d0cafd1c14274f0373fbe8337d7768a
parenta50afb91545b5a7e32a508b3eecaffe9538f018b (diff)
downloadlinux-3.10-4b2e61048c2c51882dc268dc2916a5b3bfab00ea.tar.gz
linux-3.10-4b2e61048c2c51882dc268dc2916a5b3bfab00ea.tar.bz2
linux-3.10-4b2e61048c2c51882dc268dc2916a5b3bfab00ea.zip
usb: host: xhci: Stricter conditional for Z1 system models for Compliance Mode Patch
commit b0e4e606ff6ff26da0f60826e75577b56ba4e463 upstream. This minor patch creates a more stricter conditional for the Z1 sytems for applying the Compliance Mode Patch, this to avoid the quirk to be applied to models that contain a "Z1" in their dmi product string but are different from Z1 systems. This patch should be backported to stable kernels as old as 3.2, that contain the commit 71c731a296f1b08a3724bd1b514b64f1bda87a23 "usb: host: xhci: Fix Compliance Mode on SN65LVPE502CP Hardware" Signed-off-by: Alexis R. Cortes <alexis.cortes@ti.com> Signed-off-by: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/host/xhci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 1722e218ee2..b4063fc72b4 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -480,7 +480,7 @@ static bool compliance_mode_recovery_timer_quirk_check(void)
if (strstr(dmi_product_name, "Z420") ||
strstr(dmi_product_name, "Z620") ||
strstr(dmi_product_name, "Z820") ||
- strstr(dmi_product_name, "Z1"))
+ strstr(dmi_product_name, "Z1 Workstation"))
return true;
return false;