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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8AC4DC433FE for ; Mon, 14 Nov 2022 13:03:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237735AbiKNNDe (ORCPT ); Mon, 14 Nov 2022 08:03:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58152 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237738AbiKNNDd (ORCPT ); Mon, 14 Nov 2022 08:03:33 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A7F4319C0A for ; Mon, 14 Nov 2022 05:03:32 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 444B56117E for ; Mon, 14 Nov 2022 13:03:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 576EFC433D7; Mon, 14 Nov 2022 13:03:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1668431011; bh=XGEt/MrR2cz1aBYZV56E266xzlSX2a+3jzhRo3SLlvk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eqnfSepkMR3L8ja4R12Rz2ax8N0xzsZJYJ35IQhsRWiMnMe4FMM3tGzexQM3pBlXF CU/oS2xhNVMAaSIfa9N29q7owuudAqUOJOpLF5QmR+r+CHoDB8f9fp6nY6hbswHhnh lXlr/5BsXvzCwc6PIPaNmoVNiQo3B9mSuansxCPQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, =?UTF-8?q?Martin=20Povi=C5=A1er?= , Vinod Koul , Sasha Levin Subject: [PATCH 6.0 067/190] dmaengine: apple-admac: Fix grabbing of channels in of_xlate Date: Mon, 14 Nov 2022 13:44:51 +0100 Message-Id: <20221114124501.639619084@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221114124458.806324402@linuxfoundation.org> References: <20221114124458.806324402@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Martin Povišer [ Upstream commit 8454f880c24bca0d9d4bfb6ed4a4a5429a4d9b20 ] The of_xlate callback is supposed to return the channel after already having 'grabbed' it for private use, so fill that in. Fixes: b127315d9a78 ("dmaengine: apple-admac: Add Apple ADMAC driver") Signed-off-by: Martin Povišer Link: https://lore.kernel.org/r/20221019132324.8585-1-povik+lin@cutebit.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/apple-admac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/dma/apple-admac.c b/drivers/dma/apple-admac.c index d1f74a3aa999..6780761a1640 100644 --- a/drivers/dma/apple-admac.c +++ b/drivers/dma/apple-admac.c @@ -490,7 +490,7 @@ static struct dma_chan *admac_dma_of_xlate(struct of_phandle_args *dma_spec, return NULL; } - return &ad->channels[index].chan; + return dma_get_slave_channel(&ad->channels[index].chan); } static int admac_drain_reports(struct admac_data *ad, int channo) -- 2.35.1