From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-sn1nam01on0121.outbound.protection.outlook.com ([104.47.32.121]:27502 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727725AbeH3WLM (ORCPT ); Thu, 30 Aug 2018 18:11:12 -0400 From: Sasha Levin To: "stable@vger.kernel.org" CC: Matthias Kaehlcke , Mark Brown , Sasha Levin Subject: [PATCH AUTOSEL 4.18 085/113] ASoC: rt5677: Fix initialization of rt5677_of_match.data Date: Thu, 30 Aug 2018 18:07:49 +0000 Message-ID: <20180830180714.36167-19-alexander.levin@microsoft.com> References: <20180830180714.36167-1-alexander.levin@microsoft.com> In-Reply-To: <20180830180714.36167-1-alexander.levin@microsoft.com> Content-Language: en-US Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: From: Matthias Kaehlcke [ Upstream commit f861e3e28a3016a2064d9f600eaa92a530b732b4 ] The driver expects to find the device id in rt5677_of_match.data, however it is currently assigned to rt5677_of_match.type. Fix this. The problem was found with the help of clang: sound/soc/codecs/rt5677.c:5010:36: warning: expression which evaluates to zero treated as a null pointer constant of type 'const void *' [-Wnon-literal-null-conversion] { .compatible =3D "realtek,rt5677", RT5677 }, ^~~~~~ Fixes: ddc9e69b9dc2 ("ASoC: rt5677: Hide platform data in the module source= s") Signed-off-by: Matthias Kaehlcke Reviewed-by: Guenter Roeck Acked-by: Andy Shevchenko Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/rt5677.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/rt5677.c b/sound/soc/codecs/rt5677.c index 8a0181a2db08..47feef30dadb 100644 --- a/sound/soc/codecs/rt5677.c +++ b/sound/soc/codecs/rt5677.c @@ -5007,7 +5007,7 @@ static const struct regmap_config rt5677_regmap =3D { }; =20 static const struct of_device_id rt5677_of_match[] =3D { - { .compatible =3D "realtek,rt5677", RT5677 }, + { .compatible =3D "realtek,rt5677", .data =3D (const void *)RT5677 }, { } }; MODULE_DEVICE_TABLE(of, rt5677_of_match); --=20 2.17.1