Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp40686pxb; Tue, 12 Apr 2022 16:12:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwtjM2iuopzdE9r83fjFMMXNKA78QRYJxd2DyY2Uuu9aeoZJikSBvr5WXFlFdLS4AIIp+H7 X-Received: by 2002:a63:5115:0:b0:39c:d48d:1b87 with SMTP id f21-20020a635115000000b0039cd48d1b87mr23186097pgb.107.1649805154142; Tue, 12 Apr 2022 16:12:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649805154; cv=none; d=google.com; s=arc-20160816; b=QgizUaqLnbm2GH1VdqFUQw6fo2kuaqn6qZ/PlVGU1wictupbWioutiWB8jTzzfO4LB KrWbxZMoIymp+eCOiu9tsxAzBZ+SQbupoUGZhguwMtbK+xHDaGak6y6Op7vGOg6Ehk5A VSLIgNfkbGN9ysza1B25rd7d9okoBighBkpo6dEc+pmgVm8fVY/V+M3XsTJwlO37srlp 5wlAbLmvTEUA42xqBaHSHTxyj8+zAAmkUc4XcxkoxGK6aspOx4XaysttIkof3rpYBjKe U4niSLEure6AEdJm2RcGnNKO/5CmAceomrRsjIVCZIU++wzYYPGrwMwNJ03/eAdKWNox bfdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=CKYkCIFOcyl+PMTL4y1Rj6ZHk+koSgLiWaC1XhhY8zQ=; b=CJsk+oIYJ13Tb9erkt4vFAde2sHeOx+7sM13PdHRnlejqgpI8IsbS5jPP50+9VTIuj 1OPAPz/l+UEVGPJUpWAOLmOaxK7qg1KlFr8VpctZrWzh6AZKQrzn9qKtqUwPNPktdd5K Bgr9FEWfZgXqwlEwmx4OG9MqOCNJyybrsfD995Zsv7jQzDgGuULcNPibLaLZpuI9gge1 +90uLRAyWj9wkrxMQCyUkSYZGNA7KED7zQJ6jQOyHYYpZocOM8ids9eLL2iA3zMt7jBw o56ok4SfPcV0w+KcMnx2OiLTVNNozkVOE4kv1A+M2XMS4ABgZLlbk2CX/FADpbBGXLvY tUZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=O14b2Spt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id n10-20020a170902d2ca00b00153b2d16431si14435509plc.57.2022.04.12.16.12.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:12:34 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=O14b2Spt; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 7E066BF50F; Tue, 12 Apr 2022 14:55:24 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1385799AbiDLIxB (ORCPT + 99 others); Tue, 12 Apr 2022 04:53:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1359092AbiDLHma (ORCPT ); Tue, 12 Apr 2022 03:42:30 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 015905523C; Tue, 12 Apr 2022 00:20:14 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id A546FB81B6A; Tue, 12 Apr 2022 07:20:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02CF4C385A5; Tue, 12 Apr 2022 07:20:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649748011; bh=xUTyRZPsMXwHoFuxnBfly520MoRrE/Fv7qY+hGuZ+EI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O14b2SptY1m/3b9c7Xa2L9toUNGW8HUfSyIUsBLCGuUopANFw/UKysrDA6vva6vHM TTM2PtM2mi9W6FacUU3TipI3OiGusc8sZ30cM3B36J5c/ABlrIghmIYMGOFkXiU3z3 y8YhhYVDQTL8tsOTI3pNY1Ygch5pSVB3DEIShWeY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vinod Koul , Mark Brown Subject: [PATCH 5.17 288/343] spi: core: add dma_map_dev for __spi_unmap_msg() Date: Tue, 12 Apr 2022 08:31:46 +0200 Message-Id: <20220412062959.640623253@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062951.095765152@linuxfoundation.org> References: <20220412062951.095765152@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vinod Koul commit 409543cec01a84610029d6440c480c3fdd7214fb upstream. Commit b470e10eb43f ("spi: core: add dma_map_dev for dma device") added dma_map_dev for _spi_map_msg() but missed to add for unmap routine, __spi_unmap_msg(), so add it now. Fixes: b470e10eb43f ("spi: core: add dma_map_dev for dma device") Cc: stable@vger.kernel.org # v5.14+ Signed-off-by: Vinod Koul Link: https://lore.kernel.org/r/20220406132238.1029249-1-vkoul@kernel.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- drivers/spi/spi.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1149,11 +1149,15 @@ static int __spi_unmap_msg(struct spi_co if (ctlr->dma_tx) tx_dev = ctlr->dma_tx->device->dev; + else if (ctlr->dma_map_dev) + tx_dev = ctlr->dma_map_dev; else tx_dev = ctlr->dev.parent; if (ctlr->dma_rx) rx_dev = ctlr->dma_rx->device->dev; + else if (ctlr->dma_map_dev) + rx_dev = ctlr->dma_map_dev; else rx_dev = ctlr->dev.parent;