From patchwork Thu Nov 22 04:47:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [3.5.yuz, extended, stable] Patch "xhci: endianness xhci_calculate_intel_u2_timeout" has been added to staging queue Date: Wed, 21 Nov 2012 18:47:39 -0000 From: Herton Ronaldo Krzesinski X-Patchwork-Id: 200969 Message-Id: <1353559659-1308-1-git-send-email-herton.krzesinski@canonical.com> To: Oliver Neukum Cc: Sarah Sharp , Oliver Neukum , kernel-team@lists.ubuntu.com This is a note to let you know that I have just added a patch titled xhci: endianness xhci_calculate_intel_u2_timeout to the linux-3.5.y-queue branch of the 3.5.yuz extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.yuz tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ >From a1a04df03e533df82260059b093e1a664101fc13 Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: Wed, 17 Oct 2012 12:17:50 +0200 Subject: [PATCH] xhci: endianness xhci_calculate_intel_u2_timeout commit 966e7a854177097083683176ced871558b631a12 upstream. An le16 is accessed without conversion. This patch should be backported to kernels as old as 3.5, that contain the commit e3567d2c15a7a8e2f992a5f7c7683453ca406d82 "xhci: Add Intel U1/U2 timeout policy." Signed-off-by: Oliver Neukum Signed-off-by: Sarah Sharp Signed-off-by: Herton Ronaldo Krzesinski --- drivers/usb/host/xhci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.7.9.5 diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index ad29888..1f9b8a4 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -4141,7 +4141,7 @@ static u16 xhci_calculate_intel_u2_timeout(struct usb_device *udev, (xhci_service_interval_to_ns(desc) > timeout_ns)) timeout_ns = xhci_service_interval_to_ns(desc); - u2_del_ns = udev->bos->ss_cap->bU2DevExitLat * 1000; + u2_del_ns = le16_to_cpu(udev->bos->ss_cap->bU2DevExitLat) * 1000ULL; if (u2_del_ns > timeout_ns) timeout_ns = u2_del_ns;