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 X-Spam-Level: X-Spam-Status: No, score=-0.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 241C5C4360C for ; Fri, 11 Oct 2019 01:45:50 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1C4B121929 for ; Fri, 11 Oct 2019 01:45:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="OgOXjO/o" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1C4B121929 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=renesas.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 09AB184C; Fri, 11 Oct 2019 03:44:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 09AB184C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1570758347; bh=YThLVOG4A+ae2dbS0quZQzh9PRiDSxOHoCV7/eDsKcQ=; h=Date:From:To:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=OgOXjO/o7A9s9NjIxpDoGQwz951K5W9h5y+pIil4lR46C0EdlGln/9N0aBPREN8cc QDd6tJl51zrhauSnsPYGlB589ny/Cm3QVMC+s5TZMoDQeGIlo0sX14k69FVo9qEkyv OiZHWGPNH0IImSLJvctwUyXMJUVAYjNwPtTL4s90= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 66265F8026F; Fri, 11 Oct 2019 03:44:56 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 15D7CF800E3; Fri, 11 Oct 2019 03:44:55 +0200 (CEST) Received: from relmlie6.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa1.perex.cz (Postfix) with ESMTP id 229B2F800E3 for ; Fri, 11 Oct 2019 03:44:49 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 229B2F800E3 Date: 11 Oct 2019 10:44:48 +0900 X-IronPort-AV: E=Sophos;i="5.67,282,1566831600"; d="scan'208";a="28610976" Received: from unknown (HELO relmlir5.idc.renesas.com) ([10.200.68.151]) by relmlie6.idc.renesas.com with ESMTP; 11 Oct 2019 10:44:48 +0900 Received: from morimoto-PC.renesas.com (unknown [10.166.18.140]) by relmlir5.idc.renesas.com (Postfix) with ESMTP id 128C34007F5F; Fri, 11 Oct 2019 10:44:48 +0900 (JST) Message-ID: <87lftsvywf.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Pierre-Louis Bossart In-Reply-To: <1ba82907-5f76-7992-366b-528a02a789e2@linux.intel.com> References: <87sgo2ilso.wl-kuninori.morimoto.gx@renesas.com> <871rvmilpo.wl-kuninori.morimoto.gx@renesas.com> <1ba82907-5f76-7992-366b-528a02a789e2@linux.intel.com> User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Cc: Linux-ALSA , Mark Brown Subject: Re: [alsa-devel] [PATCH 19/21] ASoC: soc-core: call snd_soc_register_dai() from snd_soc_register_dais() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Hi Pierre-Louis > > @@ -2610,14 +2610,17 @@ struct snd_soc_dai *snd_soc_register_dai(struct snd_soc_component *component, > > struct snd_soc_dai_driver *dai_drv, > > bool legacy_dai_naming) > > { > > + struct device *dev = component->dev; > > struct snd_soc_dai *dai; > > - if (dai_drv->dobj.type != SND_SOC_DOBJ_PCM) { > > - dev_err(component->dev, "Invalid dai type %d\n", > > - dai_drv->dobj.type); > > + if (dai_drv->dobj.type && > > + dai_drv->dobj.type != SND_SOC_DOBJ_PCM) { > > + dev_err(dev, "Invalid dai type %d\n", dai_drv->dobj.type); > > return NULL; > > } > > this block of code is removed in patch 20, so do we need the > modification here? Yes, it will be removed 20, but it is still exist until then. Because of this patch 19, snd_soc_register_dai() is called from soc-core which doesn't have dobj.type. Without this modification, *all* sound will get error, unfortunately. Or apply 20 first, 19 next can be more simple patch. Thank you for your help !! Best regards --- Kuninori Morimoto _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org https://mailman.alsa-project.org/mailman/listinfo/alsa-devel