Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp1894652pxp; Mon, 7 Mar 2022 04:49:51 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrPMne1ng74Lih8u57J6qWoe00YURWt20QDHesjrOeEX4PyiiKRtFcR3Z1BnMxfnJxSFMi X-Received: by 2002:a17:90a:ea83:b0:1bc:2cb6:78e0 with SMTP id h3-20020a17090aea8300b001bc2cb678e0mr13019791pjz.20.1646657391220; Mon, 07 Mar 2022 04:49:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646657391; cv=none; d=google.com; s=arc-20160816; b=yFhGYRKu+fV3MAwK3ipTIQB9NsFeTx9MtRcBxDx9oExXQtBr7pLrD+OeAga0jEhlRp YrSmVE0IdkGv88/s33Cr12sE9zdUr14kn9xd0neXTS7kEcWzIl6U0Kf3l/4pyUSeE2DP 5zJavgIzEg341c7hiCA/UtmpTzJpVbFFC+tJwfR6OIXAN526ztEtZEdEwh1fxd9UeBz5 yxqVE5z76S1MDpmrN9TWs/0oyivbgQ29ZA5IlXnuNqaso9xlBakVxTSXdd1LYkulP19x Nz4aWT6z5Wy/AMsFBOvxOYVrmHdw6xPtPV9B1T5rQqWPeicnnsanjrA/dgBxadUQchru t7UQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=H0/oQ30DjCef06pMamTtwLEzMKD6JtM6KjbkSd4ZWVo=; b=LMJgbgu7a/Qm+e2TVsh94IPwvMalUUpxXEr6+GNLRlQL1+xpEohFgkO3Ymo7tR55mH gRcwr0TlbXb6EIjdvKHYdbPG40WlTLi6oVyCV8UqnAs/99lhSyOtaTZ5L6CxaY9WLpjA WNMPKESwcAkpEB4yyS3Hpaj4y9th3GxNzBQTjzaTA6m4QppD0eoOe1lbwC890dfj2O9f gMEtDUO7FqPicTc4/60lXap1svI/DClUWRu5anu+qxne9VVYNjxWshaQCgbFmSKoVteE NEXNPGhyZ3tgSk+GM4WFgDypJ7gMAHQeNJMPVN/FEhpjru4jCU6Bd0CxgTvM+KWWvncK sk2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=pRkyu7Xw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e14-20020a63d94e000000b00374509c4794si12118826pgj.710.2022.03.07.04.49.35; Mon, 07 Mar 2022 04:49:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@microchip.com header.s=mchp header.b=pRkyu7Xw; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=microchip.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238800AbiCGKuB (ORCPT + 99 others); Mon, 7 Mar 2022 05:50:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238049AbiCGKrQ (ORCPT ); Mon, 7 Mar 2022 05:47:16 -0500 Received: from esa.microchip.iphmx.com (esa.microchip.iphmx.com [68.232.154.123]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A50C99F39C; Mon, 7 Mar 2022 02:07:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=microchip.com; i=@microchip.com; q=dns/txt; s=mchp; t=1646647652; x=1678183652; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=j8rdnFqQGxQj/EbhdN6CdN2Os+QFREnEIYaYmc4cc+g=; b=pRkyu7XwWJBoCMr8oGcvIeDF58eFN2OtbXEzS2C2O/t/VauS5NZCdXVp 8yn0VuQ/SlBjKfsVwvPjWWu9MvUyl9ou+E7UslWYhaT8FVNQIoz3hK4ok MEkY97jIfn9WluBhRxQruozn+iucMJbWV+sNBCeG470kM2WXFmXySpGde ay4rMxmQNo8KW6KyTMZwKPhFvdDHH/JYkkqABypxIUghOPEI+2ek0RRXr 91sJ5N11hbsoShDUyDf6cFmhms1JZPiPHC1LygYah1Eg4WlER/Gtffbug tj+bA5IpmT5zoRllHAHVdd9GlBrU313WMde6BWQPnuhdjlXlIxVIFMKk0 g==; X-IronPort-AV: E=Sophos;i="5.90,161,1643698800"; d="scan'208";a="88045515" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa6.microchip.iphmx.com with ESMTP/TLS/AES256-SHA256; 07 Mar 2022 03:06:07 -0700 Received: from chn-vm-ex02.mchp-main.com (10.10.85.144) by chn-vm-ex03.mchp-main.com (10.10.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.17; Mon, 7 Mar 2022 03:05:59 -0700 Received: from rob-ult-m19940.amer.actel.com (10.10.115.15) by chn-vm-ex02.mchp-main.com (10.10.85.144) with Microsoft SMTP Server id 15.1.2375.17 via Frontend Transport; Mon, 7 Mar 2022 03:05:56 -0700 From: Codrin Ciubotariu To: , , , CC: , , , , , , "Codrin Ciubotariu" Subject: [PATCH v2 1/6] ASoC: dmaengine: do not use a NULL prepare_slave_config() callback Date: Mon, 7 Mar 2022 12:04:23 +0200 Message-ID: <20220307100428.2227511-2-codrin.ciubotariu@microchip.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220307100428.2227511-1-codrin.ciubotariu@microchip.com> References: <20220307100428.2227511-1-codrin.ciubotariu@microchip.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_SCC_BODY_TEXT_LINE, T_SPF_PERMERROR autolearn=ham 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 Even if struct snd_dmaengine_pcm_config is used, prepare_slave_config() callback might not be set. Check if this callback is set before using it. Fixes: fa654e085300 ("ASoC: dmaengine-pcm: Provide default config") Signed-off-by: Codrin Ciubotariu --- Changes in v2: - none sound/soc/soc-generic-dmaengine-pcm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c index 285441d6aeed..2ab2ddc1294d 100644 --- a/sound/soc/soc-generic-dmaengine-pcm.c +++ b/sound/soc/soc-generic-dmaengine-pcm.c @@ -86,10 +86,10 @@ static int dmaengine_pcm_hw_params(struct snd_soc_component *component, memset(&slave_config, 0, sizeof(slave_config)); - if (!pcm->config) - prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; - else + if (pcm->config && pcm->config->prepare_slave_config) prepare_slave_config = pcm->config->prepare_slave_config; + else + prepare_slave_config = snd_dmaengine_pcm_prepare_slave_config; if (prepare_slave_config) { int ret = prepare_slave_config(substream, params, &slave_config); -- 2.32.0