Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3412547rwa; Tue, 23 Aug 2022 04:28:46 -0700 (PDT) X-Google-Smtp-Source: AA6agR47O8fhaXbLNzitD0wYXigmfqQw3shQ71Wo1wvNhX0U/zaAAz9LXMGx9C1w9SO8xwmQhMFj X-Received: by 2002:a63:4a08:0:b0:428:d6ca:5a99 with SMTP id x8-20020a634a08000000b00428d6ca5a99mr20872387pga.98.1661254126561; Tue, 23 Aug 2022 04:28:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661254126; cv=none; d=google.com; s=arc-20160816; b=YCziAWFmFm6Se4wNtLNj9GP4wsf0SxnmGxZTmfeazmry/JGsU9PKUul5U5XgfxcCL6 XMFPutr1W1x15pE9FqnM8YCA3fxcxyP0XR3+fQaLnhMbey3p291OVHnLnpWLd38Hwuzi 81pn/eqXUO8ww8iY9uIPnipl1xaEBEWaJJnPIAPS3Jt7iEhhfjN/mrh4ocT4y5WRilcD cgRbaTpbWvbTf+6We4U8rcIfhSb0jQztZSOGabMsv9N/z1FPP9zKcXV96w3wuzyowRSB kb9hMABK/hbh55DCBCpPQfFc1+AsSltH6Ah7CfBfepTWGHJRRIiiY75MXAnS5/MHDuZF 7Z+g== 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=JEZ4joPAZfv5S6F2rY1+5RepRn8eOsUZsQURUb+0ZN0=; b=aCfqYo2r1dZSrl23tImZ0gqaNVkIBqdBo8cUpIHRoJAs+TnVWIsXQQBr/LHgz4T5py u2vMXqO7Binm6ylCtfsNzueFN+TZwWiATP53MO9S3C9VBWJZjIbpCD6T4LgzjAW35sLa 2U91bGdHaF4nxdCtPSvA+/3+a8hfOLo1aaMKr7cBH1Wvd3WFmxDnT4aXIF2WfQkK9bwK z51XuYhDdG+HDbu8taQUAPDUIitqO+cCbrHWl3OGL6xCeKMnt2gIf0cVl5m8KJSMcwKA M3BDcrgaJjetbhQiHhsxU82peB0XHnL/6q8VZebRSkAo3GVwEgLxW6R9At0MxJ474g/H YRkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VmctdUQG; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m6-20020a654386000000b0042971e401e3si16178042pgp.307.2022.08.23.04.28.35; Tue, 23 Aug 2022 04:28:46 -0700 (PDT) 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=pass header.i=@linuxfoundation.org header.s=korg header.b=VmctdUQG; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349311AbiHWJWd (ORCPT + 99 others); Tue, 23 Aug 2022 05:22:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37732 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350433AbiHWJVr (ORCPT ); Tue, 23 Aug 2022 05:21:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 944A08E0E6; Tue, 23 Aug 2022 01:34:56 -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 1147D61499; Tue, 23 Aug 2022 08:33:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 181B7C433D6; Tue, 23 Aug 2022 08:33:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661243629; bh=XMqlULsVRDZW+IEUfiphA3cJNCqcrWzjUawBkqNX6W4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VmctdUQG7628qXMTkuyidLA2afXhOF8EKNro7oNP1FfIBkv+GNKPRC6zbFzNlYCIw fB5Oq+wlA63vdUPoYVQIrUVaUMKaDw0uhe7sti0PUkw1Vkn86rfNpbJOXX60sF3/v5 dacefLa0I9hCxP/ZLB7UAEFJJ9PHbRzRyPMLXqjw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peter Ujfalusi , Pierre-Louis Bossart , Ranjani Sridharan , Mark Brown , Sasha Levin Subject: [PATCH 5.19 330/365] ASoC: SOF: sof-client-probes: Only load the driver if IPC3 is used Date: Tue, 23 Aug 2022 10:03:51 +0200 Message-Id: <20220823080132.023341441@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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 From: Peter Ujfalusi [ Upstream commit 9b93eda355089b36482f7a2f134bdd24be70f907 ] The current implementation of probes only supports IPC3 and should not be loaded for other IPC implementation. Signed-off-by: Peter Ujfalusi Reviewed-by: Pierre-Louis Bossart Reviewed-by: Ranjani Sridharan Link: https://lore.kernel.org/r/20220712131022.1124-1-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/sof/sof-client-probes.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/sof/sof-client-probes.c b/sound/soc/sof/sof-client-probes.c index 34e6bd356e71..60e4250fac87 100644 --- a/sound/soc/sof/sof-client-probes.c +++ b/sound/soc/sof/sof-client-probes.c @@ -693,6 +693,10 @@ static int sof_probes_client_probe(struct auxiliary_device *auxdev, if (!sof_probes_enabled) return -ENXIO; + /* only ipc3 is supported */ + if (sof_client_get_ipc_type(cdev) != SOF_IPC) + return -ENXIO; + if (!dev->platform_data) { dev_err(dev, "missing platform data\n"); return -ENODEV; -- 2.35.1