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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 F313EC433E0 for ; Mon, 18 May 2020 18:13:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CA97720715 for ; Mon, 18 May 2020 18:13:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589825619; bh=CiUqSGGZ/wftLj2uPpD1velB9FbEfAK86NJmC+dCe74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Qm1XxEX+3H1A+aIO47plfWtiw92EJT7y7SJwXtbt8gM9uYAiLn1pDtD2z6TX/AtKb rzPKbdAjKqrGZHO3QVff63bq7UifbmtTVNUtfgsXiVAyTW8De5YjTocbJs0t1MMcib YmTEqWzsbpWyTHEyKOztqf2TQR9t3N2IgFUoXCww= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387528AbgERSNj (ORCPT ); Mon, 18 May 2020 14:13:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:44376 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732432AbgERSBw (ORCPT ); Mon, 18 May 2020 14:01:52 -0400 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 29A8E207C4; Mon, 18 May 2020 18:01:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589824911; bh=CiUqSGGZ/wftLj2uPpD1velB9FbEfAK86NJmC+dCe74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PHopFwl60q+WWNjwUmUdUQWMsNch2l/aywL678I2bPsL2wn1iCqvpJdAfbI5QGtpW udBOE/ll0HAs8oluD3M0CMqTuaL38Ba5Nl+75IwWNPq+jJX+AJVgO3/cDPw6Fme7Nu ygLkZjQNKK2oJqKcn6v4aSMSFruTvHnB2mL5K53w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Lubomir Rintel , Vinod Koul , Sasha Levin Subject: [PATCH 5.6 054/194] dmaengine: mmp_tdma: Do not ignore slave config validation errors Date: Mon, 18 May 2020 19:35:44 +0200 Message-Id: <20200518173536.258813664@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518173531.455604187@linuxfoundation.org> References: <20200518173531.455604187@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lubomir Rintel [ Upstream commit 363c32701c7fdc8265a84b21a6a4f45d1202b9ca ] With an invalid dma_slave_config set previously, mmp_tdma_prep_dma_cyclic() would detect an error whilst configuring the channel, but proceed happily on: [ 120.756530] mmp-tdma d42a0800.adma: mmp_tdma: unknown burst size. Signed-off-by: Lubomir Rintel Link: https://lore.kernel.org/r/20200419164912.670973-2-lkundrak@v3.sk Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/mmp_tdma.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c index 10117f271b12b..51e08c16756ae 100644 --- a/drivers/dma/mmp_tdma.c +++ b/drivers/dma/mmp_tdma.c @@ -443,7 +443,8 @@ static struct dma_async_tx_descriptor *mmp_tdma_prep_dma_cyclic( if (!desc) goto err_out; - mmp_tdma_config_write(chan, direction, &tdmac->slave_config); + if (mmp_tdma_config_write(chan, direction, &tdmac->slave_config)) + goto err_out; while (buf < buf_len) { desc = &tdmac->desc_arr[i]; -- 2.20.1