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=-5.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, T_DKIMWL_WL_HIGH,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 2C8B1C04A6B for ; Mon, 6 May 2019 15:04:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E8CDF2054F for ; Mon, 6 May 2019 15:04:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557155063; bh=LpPfRNmlyWgRKQpclZBkufT7CTTBKC7Z/rwV7dZGWR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=tnUDQ9Ni+vaicgc+z1ihHEoA2jxM5YSuZJtrqPqPzRctZY4vbDEorEYAKOct/spdE q5waKv/A8JeJ+xtS6nTRbDM62ekd1nWpQQnUZ/H0gWP3J2CcogSDL1mWFoTyyfw4tZ ddnRq9VNO7ChaLgLnT09mbbITrGPZldghGiW2dRg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727775AbfEFOjQ (ORCPT ); Mon, 6 May 2019 10:39:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:60506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727742AbfEFOjI (ORCPT ); Mon, 6 May 2019 10:39:08 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CD01220449; Mon, 6 May 2019 14:39:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1557153548; bh=LpPfRNmlyWgRKQpclZBkufT7CTTBKC7Z/rwV7dZGWR8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yvGj4tmUwkc/7Pp7tVAzdV0Tn1UVJGROU2MQ+hn1bxeG8ozLarxzvLSJQvPEHWZMB KjHod5zeTR4mC4t8a9e47rnFAskWIDAHgWZBwjK/LkR/bjHnryX/NcR7TuMxIDFCwK PID+eGw7EsgZAYPZjgAFJzublz1Z2dYQ6gyDPwAk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnaud Pouliquen , Mark Brown Subject: [PATCH 5.0 099/122] ASoC: stm32: fix sai driver name initialisation Date: Mon, 6 May 2019 16:32:37 +0200 Message-Id: <20190506143103.624590586@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190506143054.670334917@linuxfoundation.org> References: <20190506143054.670334917@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaud Pouliquen commit 17d3069ccf06970e2db3f7cbf4335f207524279e upstream. This patch fixes the sai driver structure overwriting which results in a cpu dai name equal NULL. Fixes: 3e086ed ("ASoC: stm32: add SAI driver") Signed-off-by: Arnaud Pouliquen Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/stm/stm32_sai_sub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/soc/stm/stm32_sai_sub.c +++ b/sound/soc/stm/stm32_sai_sub.c @@ -1394,7 +1394,6 @@ static int stm32_sai_sub_dais_init(struc if (!sai->cpu_dai_drv) return -ENOMEM; - sai->cpu_dai_drv->name = dev_name(&pdev->dev); if (STM_SAI_IS_PLAYBACK(sai)) { memcpy(sai->cpu_dai_drv, &stm32_sai_playback_dai, sizeof(stm32_sai_playback_dai)); @@ -1404,6 +1403,7 @@ static int stm32_sai_sub_dais_init(struc sizeof(stm32_sai_capture_dai)); sai->cpu_dai_drv->capture.stream_name = sai->cpu_dai_drv->name; } + sai->cpu_dai_drv->name = dev_name(&pdev->dev); return 0; }