Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp8320260ybl; Thu, 16 Jan 2020 14:33:30 -0800 (PST) X-Google-Smtp-Source: APXvYqx0Ka6ccR/PvU3KDCXZbUuIwv/2GMuxW56FWgxXzuDXBCGwmpWodgeNIGxX4mndsbm3Fl/7 X-Received: by 2002:a9d:7090:: with SMTP id l16mr4065601otj.187.1579214010466; Thu, 16 Jan 2020 14:33:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1579214010; cv=none; d=google.com; s=arc-20160816; b=U6GzkxXBd3X/rddJ+KcmQT8MYHP3HwiG9L0CnUvoQqvbY3qesu+0XZLXaD5Knhnl1v EYkxGzx03mEUmzhOXF+M5Y/Eu5mfQSB/JyC6KOkUvM4ncvSppCk494/txyuh5IqDP7FO YQVnLKk1xENaQDsE96U/hjo+DoCoPEqRJduIJiDp/kv70Nh9AbRbamY+2VimCakJVAf5 QKzqTTBBdXmkTCZuCMi5Ivn+zGB3Giuaz5OL/4M1yMdHzS02lasOsbrluw/o3t/T6m5w YPDVMbPtSDbnQSgIMX+X5PjV/t3l/uBFD9jB8dgSN8QGENTyh0t+Zbf2pUKbdX06fIrG XLYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iXUvUIETe9yC8XjIDMd6b5qfaxj6xil+SNPTOIpE27U=; b=xYX8/ZHleH5WaJmxoVpIR+BG1GAHGbrAHsDUOwfdbv9psI10GGdMzkwZ90Yriliwz8 8SRXKTEC5s92E+Sr836NWBWgO3f93gtRQ0rndhj1fC+LYU33tDn754JlbsHJGEYzcHN0 or4QlKoW15gkGLlkjJuRRgoE3B9Mg//RKh7c2VdGBCVyMxbbmYCH1SkBS1arod41M9Bp PDdkLrfDFRz5yrvpzyW4fjsN3ZS42Li4BtAzfa01JtqU2ZLLIH3WkouOCILSQwt91bTs kz8I0Yj99y658O76+tdrbmQfTbp4/ni3/q5oIPn2Etk8RqfBpBH2WPpR0lfa9D3d7xbI RzPg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KxCE5Qv0; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d6si12450923oic.274.2020.01.16.14.33.17; Thu, 16 Jan 2020 14:33:30 -0800 (PST) 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=@kernel.org header.s=default header.b=KxCE5Qv0; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2394845AbgAPSBB (ORCPT + 99 others); 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