From patchwork Wed Jan 22 09:28:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233614 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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, 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 77C85C2D0DB for ; Wed, 22 Jan 2020 09:31:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E3B72071E for ; Wed, 22 Jan 2020 09:31:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685500; bh=OobtrR8p1qZqyNbnT9HE8twrMP1zsQHqdcWpxh8FX5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=r+/E7uwFp4JRLJNau2VtKpI6Bw3wtxHsm8Kpp5oSa/KAhNz4qMCb7y8DYruQJ1iHw a6fa5R1XqKxSnII+sF9MSlhN0v7QH3YEAKPa/p+TnpQHr8layEhAA3oCkvzX4qTwZC k90kcMlzzNqgVUONkq6KI3ezN+iZ+DeEF0CzzxG0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729762AbgAVJbj (ORCPT ); Wed, 22 Jan 2020 04:31:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:43896 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729818AbgAVJbi (ORCPT ); Wed, 22 Jan 2020 04:31:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A81002467A; Wed, 22 Jan 2020 09:31:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579685498; bh=OobtrR8p1qZqyNbnT9HE8twrMP1zsQHqdcWpxh8FX5c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L2cQ8uLwpKlnU7wXVa1yFQ0YiOJYMFdz7y0/T9qh1eYZ8D6F3ghyxeiG3Ck7+7nGa /x57xZ3gCIFGpUPQ3uMpQuebSohRShEw3eQqadSaSiKVIO5pv+0xscqhlTzBR/6Hog XCf0mREU5nd8B2hnKzbRgOPBKnXrCQ6JTRpyCpM0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peng Fan Subject: [PATCH 4.4 31/76] tty: serial: imx: use the sg count from dma_map_sg Date: Wed, 22 Jan 2020 10:28:47 +0100 Message-Id: <20200122092755.035148779@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092751.587775548@linuxfoundation.org> References: <20200122092751.587775548@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Peng Fan commit 596fd8dffb745afcebc0ec6968e17fe29f02044c upstream. 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 --- drivers/tty/serial/imx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c @@ -545,7 +545,7 @@ static void imx_dma_tx(struct imx_port * 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,