From patchwork Mon Apr 3 08:26:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sekhar Nori X-Patchwork-Id: 96594 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp1770621qgd; Mon, 3 Apr 2017 01:27:38 -0700 (PDT) X-Received: by 10.98.219.3 with SMTP id f3mr15536936pfg.181.1491208058084; Mon, 03 Apr 2017 01:27:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f21si13572007pgg.271.2017.04.03.01.27.37; Mon, 03 Apr 2017 01:27:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752017AbdDCI1g (ORCPT + 25 others); Mon, 3 Apr 2017 04:27:36 -0400 Received: from fllnx209.ext.ti.com ([198.47.19.16]:64874 "EHLO fllnx209.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751856AbdDCI1e (ORCPT ); Mon, 3 Apr 2017 04:27:34 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id v338R02A026069; Mon, 3 Apr 2017 03:27:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1491208020; bh=70NT+T4wvnuPGPW868NQYILz7rQsW1ncRVvaU1EuMKQ=; h=From:To:CC:Subject:Date; b=dbyJarLlZMn+/fFjCXeWr1CIadcviJhhgJ8DUGYQXRSDuoITqyNO6cY8oRSVrDwFG alq/bf6XTxP4QG1TjagOU5HJGTan3R3AKxQQowCjNBSFnlkHrhKAM/eYVYU2gyj3eB SyeQel6TI2oQseff5oORWt2rLA5VGZvTFvPVQIBc= Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id v338QtN5026135; Mon, 3 Apr 2017 03:26:55 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.294.0; Mon, 3 Apr 2017 03:26:54 -0500 Received: from psplinux063.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id v338Qqo7009016; Mon, 3 Apr 2017 03:26:53 -0500 From: Sekhar Nori To: Greg Kroah-Hartman , Arnd Bergmann CC: Roger Quadros , , , Sekhar Nori Subject: [PATCH] usb: hcd: use correct device pointer for dma ops Date: Mon, 3 Apr 2017 13:56:52 +0530 Message-ID: <11abdb74e4578f4108d70eea28ade77ff61df8ac.1491207551.git.nsekhar@ti.com> X-Mailer: git-send-email 2.9.0 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit a8c06e407ef9 ("usb: separate out sysdev pointer from usb_bus") converted to use hcd->self.sysdev for DMA operations instead of hcd->self.controller but forgot to do it for one instance. This gets caught when DMA debugging is enabled since dma map and unmap end up using different device pointers. Fix it. Fixes: a8c06e407ef9 ("usb: separate out sysdev pointer from usb_bus") Reported-by: Carlos Hernandez Acked-by: Roger Quadros Signed-off-by: Sekhar Nori --- drivers/usb/core/hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c index da7ee5735c14..49550790a3cb 100644 --- a/drivers/usb/core/hcd.c +++ b/drivers/usb/core/hcd.c @@ -1436,7 +1436,7 @@ void usb_hcd_unmap_urb_setup_for_dma(struct usb_hcd *hcd, struct urb *urb) { if (IS_ENABLED(CONFIG_HAS_DMA) && (urb->transfer_flags & URB_SETUP_MAP_SINGLE)) - dma_unmap_single(hcd->self.controller, + dma_unmap_single(hcd->self.sysdev, urb->setup_dma, sizeof(struct usb_ctrlrequest), DMA_TO_DEVICE);