Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753583AbbDGJss (ORCPT ); Tue, 7 Apr 2015 05:48:48 -0400 Received: from mail-la0-f48.google.com ([209.85.215.48]:32898 "EHLO mail-la0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753482AbbDGJrS (ORCPT ); Tue, 7 Apr 2015 05:47:18 -0400 From: Johan Hovold To: Greg Kroah-Hartman , Felipe Balbi , Alan Stern Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Stephen Warren , Thierry Reding , Alexandre Courbot , linux-tegra@vger.kernel.org, Johan Hovold , stable Subject: [PATCH 2/2] USB: ehci-tegra: fix inefficient copy of unaligned buffers Date: Tue, 7 Apr 2015 11:46:52 +0200 Message-Id: <1428400012-7563-3-git-send-email-johan@kernel.org> X-Mailer: git-send-email 2.0.5 In-Reply-To: <1428400012-7563-1-git-send-email-johan@kernel.org> References: <1428400012-7563-1-git-send-email-johan@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1491 Lines: 39 Make sure only to copy any actual data rather than the whole buffer, when releasing the temporary buffer used for unaligned transfer buffers. Note that the corresponding fix of musb also fixes a lockup on disconnect, where repeated failed transfers would starve the hub workqueue from processing the disconnect, which would have prevented the urbs from being resubmitted. In this case there is no data to forward, but the full buffer length was being copied nonetheless. Compile-tested only. Fixes: fbf9865c6d96 ("USB: ehci: tegra: Align DMA transfers to 32 bytes") Cc: stable # v2.6.39 Signed-off-by: Johan Hovold --- drivers/usb/host/ehci-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index ff9af29b4e9f..dfe2a7abc36d 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -313,7 +313,7 @@ static void free_dma_aligned_buffer(struct urb *urb) if (usb_urb_dir_in(urb)) memcpy(temp->old_xfer_buffer, temp->data, - urb->transfer_buffer_length); + urb->actual_length); urb->transfer_buffer = temp->old_xfer_buffer; kfree(temp->kmalloc_ptr); -- 2.0.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/