Received: by 2002:a05:6a10:6d10:0:0:0:0 with SMTP id gq16csp39297pxb; Tue, 12 Apr 2022 16:10:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzbVGTw8YE8LCuTCt0G31zvyatX/6loDFYRU55POiohf89S8bXofrk7k26CFOP0Dbi6Lz5v X-Received: by 2002:a17:902:ccc4:b0:156:5d37:b42f with SMTP id z4-20020a170902ccc400b001565d37b42fmr39522632ple.157.1649805010958; Tue, 12 Apr 2022 16:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649805010; cv=none; d=google.com; s=arc-20160816; b=DrHxffSewN0OUaNmcGuCdVmF+Yqq78BqQSqQvOCb+PmiPu5ZtZejjV0E3L0C3yYoxW qbaZdgTpY04PQEG0K7hb6nxFDoFPNG43aJiFgufHHZ6dnDJChxm43XVGmLs9dRTRPt0A 88Hfs6vZkFZeKvEjnpb4zoVkgnsw/K3KWW0BL8cW55RetAYrki7BUoHut8jWda7b5nu1 FOurAWqv5+7pMiwjsqo+6LmIXqMyVrJfLpAWgjVJzBpyTNchAwhn0U6kzjX3YBv7gNM4 8o2u5OJlmzU9jVTwPem395tZBIEF6FbEm5Y77Akv91hrbyH/1WPdE+DZHOrGbTj5DYBK 1sDQ== 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=m1NSgnBXAsdJgkWuJcpbZ0CiYkG1SQpC6Cm6jLhtHqo=; b=KQLQZxpd256RLWgSFOO0C+K4YkROgxGYQLgQSZz6dn9zacdhXhd8kQsdMUX49CHwrI JIvFU3zZoS8jr5zSorNsDcgNQngUJmZArH3Btuhdbkvol4F4Uyn0A6GxG7njmChLmmlx OnVEtZLLFGgMLUuNnv9RCQ8L49+f5aLFRObenhlPJ1HB6kuGpzt6jE6R+N1MOCyv/+j6 vrOWUwqXOa/W9YMxDtfMli+YmB9e4ZTuLGgoHZQdCwZrHweEVSVYPljzyGyK5IItGXht jro6arljxy+3cLEWRocr4+D9Av3MfYXx8p3qMw/gM5swXo/ie8nvbinygc3zgVu1Hql3 zUzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pJMVmmHZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id u22-20020a63df16000000b003817672f2d4si4046585pgg.316.2022.04.12.16.10.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Apr 2022 16:10:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=pJMVmmHZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 0C0181587BB; Tue, 12 Apr 2022 14:52:15 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353708AbiDLHeE (ORCPT + 99 others); Tue, 12 Apr 2022 03:34:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351810AbiDLHM7 (ORCPT ); Tue, 12 Apr 2022 03:12:59 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69C8F6596; Mon, 11 Apr 2022 23:53:07 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 047706149D; Tue, 12 Apr 2022 06:53:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C79AC385A1; Tue, 12 Apr 2022 06:53:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649746386; bh=NnPyFX9ESh47Qq4ZcmAI1zcai2GgoRQxZAL1tOSFISA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pJMVmmHZOuMWUmrQugtYigfd+d/IOFUCese63HHC901r9+4gmEYvh5A6NxGuu5bvK UBm3mwP8zevp1L1rbi1FF1SyjMUFonISX0reaFWXISnFcAo91+hAQXSsxJDz61RjzT GprWUvO0d2eiesM2AMipsaHVcluORLWgMRuinbAs= 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.15 227/277] spi: core: add dma_map_dev for __spi_unmap_msg() Date: Tue, 12 Apr 2022 08:30:30 +0200 Message-Id: <20220412062948.614028684@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220412062942.022903016@linuxfoundation.org> References: <20220412062942.022903016@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 @@ -1072,11 +1072,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;