From patchwork Wed Feb 10 14:07:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Paterson X-Patchwork-Id: 8272311 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B23CDBEEE5 for ; Wed, 10 Feb 2016 14:11:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CBA59203B4 for ; Wed, 10 Feb 2016 14:11:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A84D72020F for ; Wed, 10 Feb 2016 14:11:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751113AbcBJOL0 (ORCPT ); Wed, 10 Feb 2016 09:11:26 -0500 Received: from relmlor4.renesas.com ([210.160.252.174]:10706 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751183AbcBJOLZ (ORCPT ); Wed, 10 Feb 2016 09:11:25 -0500 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 10 Feb 2016 23:11:24 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 177AD51B87; Wed, 10 Feb 2016 23:11:24 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id 14F332806E; Wed, 10 Feb 2016 23:11:24 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id 0DCAE2806D; Wed, 10 Feb 2016 23:11:24 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id ZAH18563; Wed, 10 Feb 2016 23:11:24 +0900 X-IronPort-AV: E=Sophos;i="5.22,426,1449500400"; d="scan'208";a="205369704" Received: from unknown (HELO localhost.localdomain) ([172.29.43.6]) by relmlii2.idc.renesas.com with ESMTP; 10 Feb 2016 23:11:20 +0900 From: Chris Paterson To: ulf.hansson@linaro.org Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, kuninori.morimoto.gx@renesas.com, ykaneko0929@gmail.com, arnd@arndb.de, geert+renesas@glider.be, laurent.pinchart@ideasonboard.com, kouichi.tomita.yn@renesas.com, takeshi.kihara.df@renesas.com, koji.matsuoka.xm@renesas.com, Chris Paterson Subject: [PATCH] mmc: sh_mmcif: Correct TX DMA channel allocation Date: Wed, 10 Feb 2016 14:07:01 +0000 Message-Id: <1455113221-18117-1-git-send-email-chris.paterson2@renesas.com> X-Mailer: git-send-email 1.9.1 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Commit 27cbd7e815a8 ("mmc: sh_mmcif: rework dma channel handling") introduced a typo causing the TX DMA channel allocation to be overwritten by the requested RX DMA channel. Signed-off-by: Chris Paterson Acked-by: Laurent Pinchart Acked-by: Arnd Bergmann --- drivers/mmc/host/sh_mmcif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/host/sh_mmcif.c b/drivers/mmc/host/sh_mmcif.c index e0c076a..8d870ce 100644 --- a/drivers/mmc/host/sh_mmcif.c +++ b/drivers/mmc/host/sh_mmcif.c @@ -445,7 +445,7 @@ static void sh_mmcif_request_dma(struct sh_mmcif_host *host) pdata->slave_id_rx); } else { host->chan_tx = dma_request_slave_channel(dev, "tx"); - host->chan_tx = dma_request_slave_channel(dev, "rx"); + host->chan_rx = dma_request_slave_channel(dev, "rx"); } dev_dbg(dev, "%s: got channel TX %p RX %p\n", __func__, host->chan_tx, host->chan_rx);