From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B48EEC33CAF for ; Thu, 16 Jan 2020 18:01:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8453C214AF for ; Thu, 16 Jan 2020 18:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579197662; bh=Fz0iwlYQb3AI2FWlTCnZlv/YpHHlg9Rxquncv+MXZsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=o2Ad70tYSbhcD+vvWba6lQoK5rdWtW+agqJoFydZPtSQVgnFBd/50JAmbA2BOpEiG IBxv7NjFGsnT85JmRW/78De3cheSAj62QhOLUjExnMU2K57r5J1H/urZr97j0VwmM6 PbBtqvHxzrJkwhCFmQ4sFu25+xxHZmfpe3IwVwM4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394864AbgAPSBB (ORCPT ); Thu, 16 Jan 2020 13:01:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:59326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405750AbgAPRli (ORCPT ); Thu, 16 Jan 2020 12:41:38 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 38EC3246FC; Thu, 16 Jan 2020 17:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196498; bh=Fz0iwlYQb3AI2FWlTCnZlv/YpHHlg9Rxquncv+MXZsk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KxCE5Qv0AKWVmdjft/Bh2B0J3Fe5f4VVwjzl5i51TwQhcIjgGa28rxQ9uPUJULpta 33S5WzLVHdpED9Kg9hBGYwpji5GPP754Brqj8RMSJ15TGKt8aLI8ckQMeF08CBBQpg 0/8SJtX+Y1YILpWlrBI1vkxYUOLR8JcfM0Mmj270= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Peng Fan , Greg Kroah-Hartman , Sasha Levin , linux-serial@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 4.9 240/251] tty: serial: imx: use the sg count from dma_map_sg Date: Thu, 16 Jan 2020 12:36:29 -0500 Message-Id: <20200116173641.22137-200-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Fan [ Upstream commit 596fd8dffb745afcebc0ec6968e17fe29f02044c ] The dmaengine_prep_slave_sg needs to use sg count returned by dma_map_sg, not use sport->dma_tx_nents, because the return value of dma_map_sg is not always same with "nents". Fixes: b4cdc8f61beb ("serial: imx: add DMA support for imx6q") Signed-off-by: Peng Fan Link: https://lore.kernel.org/r/1573108875-26530-1-git-send-email-peng.fan@nxp.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 6d596c635159..e75bd8d7e6f6 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -548,7 +548,7 @@ static void imx_dma_tx(struct imx_port *sport) dev_err(dev, "DMA mapping error for TX.\n"); return; } - desc = dmaengine_prep_slave_sg(chan, sgl, sport->dma_tx_nents, + desc = dmaengine_prep_slave_sg(chan, sgl, ret, DMA_MEM_TO_DEV, DMA_PREP_INTERRUPT); if (!desc) { dma_unmap_sg(dev, sgl, sport->dma_tx_nents, -- 2.20.1