February 2019 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] printk: Remove no longer used LOG_PREFIX.
by Tetsuo Handa 22 Feb '19

22 Feb '19

When commit 5becfb1df5ac8e49 ("kmsg: merge continuation records while printing") introduced LOG_PREFIX, we used KERN_DEFAULT etc. as a flag for setting LOG_PREFIX in order to tell whether to call cont_add() (i.e. whether to append the message to "struct cont"). But since commit 4bcc595ccd80decb ("printk: reinstate KERN_CONT for printing continuation lines") inverted the behavior (i.e. don't append the message to "struct cont" unless KERN_CONT is specified) and commit 5aa068ea4082b39e ("printk: remove games with previous record flags") removed the last LOG_PREFIX check, setting LOG_PREFIX via KERN_DEFAULT etc. is no longer meaningful. Therefore, we can remove LOG_PREFIX and make KERN_DEFAULT empty string. Signed-off-by: Tetsuo Handa <penguin-kernel(a)I-love.SAKURA.ne.jp> --- include/linux/kern_levels.h | 2 +- include/linux/printk.h | 1 - kernel/printk/printk.c | 6 +----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/include/linux/kern_levels.h b/include/linux/kern_levels.h index d237fe8..bf2389c 100644 --- a/include/linux/kern_levels.h +++ b/include/linux/kern_levels.h @@ -14,7 +14,7 @@ #define KERN_INFO KERN_SOH "6" /* informational */ #define KERN_DEBUG KERN_SOH "7" /* debug-level messages */ -#define KERN_DEFAULT KERN_SOH "d" /* the default kernel loglevel */ +#define KERN_DEFAULT "" /* the default kernel loglevel */ /* * Annotation for a "continued" line of log printout (only done after a diff --git a/include/linux/printk.h b/include/linux/printk.h index 77740a5..9fe6c9e 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -18,7 +18,6 @@ static inline int printk_get_level(const char *buffer) if (buffer[0] == KERN_SOH_ASCII && buffer[1]) { switch (buffer[1]) { case '0' ... '7': - case 'd': /* KERN_DEFAULT */ case 'c': /* KERN_CONT */ return buffer[1]; } diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index d3d1703..3e4a735 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -344,7 +344,6 @@ enum con_msg_format_flags { enum log_flags { LOG_NEWLINE = 2, /* text ended with a newline */ - LOG_PREFIX = 4, /* text started with a prefix */ LOG_CONT = 8, /* text is a fragment of a continuation line */ }; @@ -1867,9 +1866,6 @@ int vprintk_store(int facility, int level, case '0' ... '7': if (level == LOGLEVEL_DEFAULT) level = kern_level - '0'; - /* fallthrough */ - case 'd': /* KERN_DEFAULT */ - lflags |= LOG_PREFIX; break; case 'c': /* KERN_CONT */ lflags |= LOG_CONT; @@ -1884,7 +1880,7 @@ int vprintk_store(int facility, int level, level = default_message_loglevel; if (dict) - lflags |= LOG_PREFIX|LOG_NEWLINE; + lflags |= LOG_NEWLINE; return log_output(facility, level, lflags, dict, dictlen, text, text_len); -- 1.8.3.1

1 0

[alsa-devel] [PATCH 1/3] ALSA: hda/tegra: property for card name
by Sameer Pujar 22 Feb '19

22 Feb '19

An optional property "nvidia,model" is introduced for hda to pass custom name for the sound card. The suffix "-hda" in the name passed is useful to distinguish between multiple cards available for a platform. When the property is not specified, default name("tegra-hda") mentioned in hda driver is used. This property can be added in platform specific file of the board and card name can relate to the board in use. Signed-off-by: Sameer Pujar <spujar(a)nvidia.com> Reviewed-by: Jonathan Hunter <jonathanh(a)nvidia.com> --- Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt index 44d2745..21cd310 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.txt @@ -13,6 +13,10 @@ Required properties: See ../reset/reset.txt for details. - reset-names : Must include the following entries: hda, hda2hdmi, hda2codec_2x +Optional properties: +- nvidia,model : The user-visible name of this sound complex. Since the property + is optional, legacy boards can use default name provided in hda driver. + Example: hda@70030000 { @@ -27,4 +31,5 @@ hda@70030000 { <&tegra_car 128>, /* hda2hdmi */ <&tegra_car 111>; /* hda2codec_2x */ reset-names = "hda", "hda2hdmi", "hda2codec_2x"; + nvidia,model = "jetson-tk1-hda"; }; -- 2.7.4

2 5

[alsa-devel] doc pages don't work
by Jarek 22 Feb '19

22 Feb '19

Hi, https://www.alsa-project.org/alsa-doc/alsa-lib/ return 404 Jarek

2 1

[alsa-devel] Playback samples at a specific time on Intel HDA
by Rajagopal Aravindan 21 Feb '19

21 Feb '19

Hello, I am trying to accomplish synchronized audio playback using ALSA & gPTP, on an Intel SkyLake platform have Intel HDA. I do understand that, starting with SkyLake platform, there is support for querying link time. But, how do I instruct to play the samples at a given (gPTP) time ? Is this possible ? Can someone please point me to code or doc, relevant to my goal ? In essence, I would like to play the samples at the stroke of a given (gPTP) time. Also, the ALSA page says ... "The link time can be directly measured if supported in hardware by sample counters or wallclocks (e.g. with HDAudio 24MHz or PTP clock for networked solutions)" What is the connection between PTP clock and sound card here, are there sound cards that can latch on to a PTP clock on a NIC or what ? Thanks in advance. Regards, Rajagopal

2 1

[alsa-devel] Regarding alsa-utils commit "alsaucm: add alsa-ucm udev rules for PAZ00 (Toshiba AC100/Dynabook AZ)."
by Tanu Kaskinen 21 Feb '19

21 Feb '19

Hi Jaroslav, I'm updating alsa-utils in OpenEmbedded, and I noticed that there's a new udev rules file, 89-alsa-ucm.rules. It seems to just initialize the mixer settings for particular hardware (Toshiba AC100/Dynabook AZ), and doing that in alsa-utils seems weird. Why does this hardware use a udev rules file for initialization, unlike any other hardware? I think it would be good to have an explanatory comment in the rules file. -- Tanu https://www.patreon.com/tanuk https://liberapay.com/tanuk

2 2

[alsa-devel] [RFC 0/4] clk/driver: platform: Fix kfree() of const memory on setting driver_override
by Krzysztof Kozlowski 21 Feb '19

21 Feb '19

Hi, The problem =========== Several device types (platform, amba, spi etc.) provide a driver_override field. On sysfs store or during device removal, they kfree() the existing value. However the users are unaware of this and set the driver_override like: pdev->driver_override = "exynos5-subcmu"; which obviously leads to error. Solution ======== I provided simple helper for platform device. If this approach is acceptable, I can convert also other buses, like AMBA, SPI. Dependencies and pick up order ============================== Patch 1: please pick it as is through clock tree Patch 3: Depends on patch 1 (merge conflict) and 2. Patch 4: Depends on patch 2. Best regards, Krzysztof Krzysztof Kozlowski (4): clk: samsung: exynos5: Fix possible NULL pointer exception on platform_device_alloc() failure driver: platform: Provide helper for safer setting of driver_override clk: samsung: exynos5: Fix kfree() of const memory on setting driver_override slimbus: ngd: Fix kfree() of const memory on setting driver_override drivers/base/platform.c | 63 ++++++++++++++++++++++---------- drivers/clk/samsung/clk-exynos5-subcmu.c | 12 ++++-- drivers/slimbus/qcom-ngd-ctrl.c | 2 +- include/linux/platform_device.h | 9 ++++- 4 files changed, 61 insertions(+), 25 deletions(-) -- 2.7.4

3 8

[alsa-devel] [PATCH] ASoC: samsung: odroid: Prevent uninitialized variable use
by Sylwester Nawrocki 21 Feb '19

21 Feb '19

This addresses an issue pointed out by compiler warning: sound/soc/samsung/odroid.c: In function ‘odroid_audio_probe’: sound/soc/samsung/odroid.c:298:22: warning: ‘cpu_dai’ may be used uninitialized in this function [-Wmaybe-uninitialized] priv->clk_i2s_bus = of_clk_get_by_name(cpu_dai, "iis"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- sound/soc/samsung/odroid.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index c3b0f6c612cb..694512f980fd 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -194,7 +194,8 @@ static struct snd_soc_dai_link odroid_card_dais[] = { static int odroid_audio_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; - struct device_node *cpu, *cpu_dai, *codec; + struct device_node *cpu_dai = NULL; + struct device_node *cpu, *codec; struct odroid_priv *priv; struct snd_soc_card *card; struct snd_soc_dai_link *link, *codec_link; @@ -271,8 +272,11 @@ static int odroid_audio_probe(struct platform_device *pdev) if (ret < 0) break; } - if (ret == 0) + if (ret == 0) { cpu_dai = of_parse_phandle(cpu, "sound-dai", 0); + if (!cpu_dai) + ret = -EINVAL; + } of_node_put(cpu); of_node_put(codec); -- 2.17.1

2 1

[alsa-devel] [PATCH] ALSA: hda/realtek: Enable audio jacks of ASUS UX362FA with ALC294
by Jian-Hong Pan 21 Feb '19

21 Feb '19

The ASUS UX362FA with ALC294 cannot detect the headset MIC and outputs through the internal speaker and the headphone. This issue can be fixed by the quirk in the commit 4e0511067 ALSA: hda/realtek: Enable audio jacks of ASUS UX533FD with ALC294. Besides, ASUS UX362FA and UX533FD have the same audio initial pin config values. So, this patch replaces SND_PCI_QUIRK of UX533FD with a new SND_HDA_PIN_QUIRK which benefits both UX362FA and UX533FD. Signed-off-by: Jian-Hong Pan <jian-hong(a)endlessm.com> Signed-off-by: Ming Shuo Chiu <chiu(a)endlessm.com> --- sound/pci/hda/patch_realtek.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 1ffa36e987b4..6421864a8a0f 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -6771,7 +6771,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), - SND_PCI_QUIRK(0x1043, 0x14a1, "ASUS UX533FD", ALC294_FIXUP_ASUS_SPK), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), @@ -7388,6 +7387,10 @@ static const struct snd_hda_pin_quirk alc269_pin_fixup_tbl[] = { {0x14, 0x90170110}, {0x1b, 0x90a70130}, {0x21, 0x04211020}), + SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK, + {0x12, 0x90a60130}, + {0x17, 0x90170110}, + {0x21, 0x03211020}), SND_HDA_PIN_QUIRK(0x10ec0294, 0x1043, "ASUS", ALC294_FIXUP_ASUS_SPK, {0x12, 0x90a60130}, {0x17, 0x90170110}, -- 2.20.1

2 1

[alsa-devel] [asoc:for-5.1 255/257] sound/soc/samsung/odroid.c:298:22: warning: 'cpu_dai' may be used uninitialized in this function
by kbuild test robot 20 Feb '19

20 Feb '19

tree: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.1 head: 70b773219a32c7b8f3e53e041bc023ad99fd81f4 commit: d832d2b246c516eacb2d0ba53ec17ed59c3cd62b [255/257] ASoC: samsung: odroid: Fix of_node refcount unbalance config: sh-allmodconfig (attached as .config) compiler: sh4-linux-gnu-gcc (Debian 8.2.0-11) 8.2.0 reproduce: wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout d832d2b246c516eacb2d0ba53ec17ed59c3cd62b # save the attached .config to linux build tree GCC_VERSION=8.2.0 make.cross ARCH=sh Note: it may well be a FALSE warning. FWIW you are at least aware of it now. http://gcc.gnu.org/wiki/Better_Uninitialized_Warnings All warnings (new ones prefixed by >>): sound/soc/samsung/odroid.c: In function 'odroid_audio_probe': >> sound/soc/samsung/odroid.c:298:22: warning: 'cpu_dai' may be used uninitialized in this function [-Wmaybe-uninitialized] priv->clk_i2s_bus = of_clk_get_by_name(cpu_dai, "iis"); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ vim +/cpu_dai +298 sound/soc/samsung/odroid.c aba611fc Sylwester Nawrocki 2017-04-21 193 aba611fc Sylwester Nawrocki 2017-04-21 194 static int odroid_audio_probe(struct platform_device *pdev) aba611fc Sylwester Nawrocki 2017-04-21 195 { aba611fc Sylwester Nawrocki 2017-04-21 196 struct device *dev = &pdev->dev; bc3cf17b Sylwester Nawrocki 2019-02-14 197 struct device_node *cpu, *cpu_dai, *codec; aba611fc Sylwester Nawrocki 2017-04-21 198 struct odroid_priv *priv; aba611fc Sylwester Nawrocki 2017-04-21 199 struct snd_soc_card *card; bc3cf17b Sylwester Nawrocki 2019-02-14 200 struct snd_soc_dai_link *link, *codec_link; bc3cf17b Sylwester Nawrocki 2019-02-14 201 int num_pcms, ret, i; bc3cf17b Sylwester Nawrocki 2019-02-14 202 struct of_phandle_args args = {}; aba611fc Sylwester Nawrocki 2017-04-21 203 aba611fc Sylwester Nawrocki 2017-04-21 204 priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); aba611fc Sylwester Nawrocki 2017-04-21 205 if (!priv) aba611fc Sylwester Nawrocki 2017-04-21 206 return -ENOMEM; aba611fc Sylwester Nawrocki 2017-04-21 207 aba611fc Sylwester Nawrocki 2017-04-21 208 card = &priv->card; aba611fc Sylwester Nawrocki 2017-04-21 209 card->dev = dev; aba611fc Sylwester Nawrocki 2017-04-21 210 aba611fc Sylwester Nawrocki 2017-04-21 211 card->owner = THIS_MODULE; aba611fc Sylwester Nawrocki 2017-04-21 212 card->fully_routed = true; aba611fc Sylwester Nawrocki 2017-04-21 213 b5c16a24 Sylwester Nawrocki 2019-02-14 214 spin_lock_init(&priv->lock); aba611fc Sylwester Nawrocki 2017-04-21 215 snd_soc_card_set_drvdata(card, priv); aba611fc Sylwester Nawrocki 2017-04-21 216 aba611fc Sylwester Nawrocki 2017-04-21 217 ret = snd_soc_of_parse_card_name(card, "model"); aba611fc Sylwester Nawrocki 2017-04-21 218 if (ret < 0) aba611fc Sylwester Nawrocki 2017-04-21 219 return ret; aba611fc Sylwester Nawrocki 2017-04-21 220 aba611fc Sylwester Nawrocki 2017-04-21 221 if (of_property_read_bool(dev->of_node, "samsung,audio-widgets")) { aba611fc Sylwester Nawrocki 2017-04-21 222 ret = snd_soc_of_parse_audio_simple_widgets(card, aba611fc Sylwester Nawrocki 2017-04-21 223 "samsung,audio-widgets"); aba611fc Sylwester Nawrocki 2017-04-21 224 if (ret < 0) aba611fc Sylwester Nawrocki 2017-04-21 225 return ret; aba611fc Sylwester Nawrocki 2017-04-21 226 } aba611fc Sylwester Nawrocki 2017-04-21 227 aba611fc Sylwester Nawrocki 2017-04-21 228 if (of_property_read_bool(dev->of_node, "samsung,audio-routing")) { aba611fc Sylwester Nawrocki 2017-04-21 229 ret = snd_soc_of_parse_audio_routing(card, aba611fc Sylwester Nawrocki 2017-04-21 230 "samsung,audio-routing"); aba611fc Sylwester Nawrocki 2017-04-21 231 if (ret < 0) aba611fc Sylwester Nawrocki 2017-04-21 232 return ret; aba611fc Sylwester Nawrocki 2017-04-21 233 } aba611fc Sylwester Nawrocki 2017-04-21 234 bc3cf17b Sylwester Nawrocki 2019-02-14 235 card->dai_link = odroid_card_dais; bc3cf17b Sylwester Nawrocki 2019-02-14 236 card->num_links = ARRAY_SIZE(odroid_card_dais); aba611fc Sylwester Nawrocki 2017-04-21 237 aba611fc Sylwester Nawrocki 2017-04-21 238 cpu = of_get_child_by_name(dev->of_node, "cpu"); aba611fc Sylwester Nawrocki 2017-04-21 239 codec = of_get_child_by_name(dev->of_node, "codec"); bc3cf17b Sylwester Nawrocki 2019-02-14 240 link = card->dai_link; bc3cf17b Sylwester Nawrocki 2019-02-14 241 codec_link = &card->dai_link[1]; bc3cf17b Sylwester Nawrocki 2019-02-14 242 bc3cf17b Sylwester Nawrocki 2019-02-14 243 /* bc3cf17b Sylwester Nawrocki 2019-02-14 244 * For backwards compatibility create the secondary CPU DAI link only bc3cf17b Sylwester Nawrocki 2019-02-14 245 * if there are 2 CPU DAI entries in the cpu sound-dai property in DT. f89aea0f Sylwester Nawrocki 2019-02-15 246 * Also add required DAPM routes not available in old DTS. bc3cf17b Sylwester Nawrocki 2019-02-14 247 */ bc3cf17b Sylwester Nawrocki 2019-02-14 248 num_pcms = of_count_phandle_with_args(cpu, "sound-dai", bc3cf17b Sylwester Nawrocki 2019-02-14 249 "#sound-dai-cells"); f89aea0f Sylwester Nawrocki 2019-02-15 250 if (num_pcms == 1) { f89aea0f Sylwester Nawrocki 2019-02-15 251 card->dapm_routes = odroid_dapm_routes; f89aea0f Sylwester Nawrocki 2019-02-15 252 card->num_dapm_routes = ARRAY_SIZE(odroid_dapm_routes); bc3cf17b Sylwester Nawrocki 2019-02-14 253 card->num_links--; f89aea0f Sylwester Nawrocki 2019-02-15 254 } bc3cf17b Sylwester Nawrocki 2019-02-14 255 bc3cf17b Sylwester Nawrocki 2019-02-14 256 for (i = 0; i < num_pcms; i++, link += 2) { bc3cf17b Sylwester Nawrocki 2019-02-14 257 ret = of_parse_phandle_with_args(cpu, "sound-dai", bc3cf17b Sylwester Nawrocki 2019-02-14 258 "#sound-dai-cells", i, &args); bc3cf17b Sylwester Nawrocki 2019-02-14 259 if (ret < 0) d832d2b2 Sylwester Nawrocki 2019-02-20 260 break; aba611fc Sylwester Nawrocki 2017-04-21 261 bc3cf17b Sylwester Nawrocki 2019-02-14 262 if (!args.np) { bc3cf17b Sylwester Nawrocki 2019-02-14 263 dev_err(dev, "sound-dai property parse error: %d\n", ret); d832d2b2 Sylwester Nawrocki 2019-02-20 264 ret = -EINVAL; d832d2b2 Sylwester Nawrocki 2019-02-20 265 break; aba611fc Sylwester Nawrocki 2017-04-21 266 } aba611fc Sylwester Nawrocki 2017-04-21 267 bc3cf17b Sylwester Nawrocki 2019-02-14 268 ret = snd_soc_get_dai_name(&args, &link->cpu_dai_name); bc3cf17b Sylwester Nawrocki 2019-02-14 269 of_node_put(args.np); bc3cf17b Sylwester Nawrocki 2019-02-14 270 aba611fc Sylwester Nawrocki 2017-04-21 271 if (ret < 0) d832d2b2 Sylwester Nawrocki 2019-02-20 272 break; bc3cf17b Sylwester Nawrocki 2019-02-14 273 } d832d2b2 Sylwester Nawrocki 2019-02-20 274 if (ret == 0) bc3cf17b Sylwester Nawrocki 2019-02-14 275 cpu_dai = of_parse_phandle(cpu, "sound-dai", 0); d832d2b2 Sylwester Nawrocki 2019-02-20 276 bc3cf17b Sylwester Nawrocki 2019-02-14 277 of_node_put(cpu); bc3cf17b Sylwester Nawrocki 2019-02-14 278 of_node_put(codec); d832d2b2 Sylwester Nawrocki 2019-02-20 279 if (ret < 0) d832d2b2 Sylwester Nawrocki 2019-02-20 280 return ret; aba611fc Sylwester Nawrocki 2017-04-21 281 bc3cf17b Sylwester Nawrocki 2019-02-14 282 ret = snd_soc_of_get_dai_link_codecs(dev, codec, codec_link); bc3cf17b Sylwester Nawrocki 2019-02-14 283 if (ret < 0) d832d2b2 Sylwester Nawrocki 2019-02-20 284 goto err_put_cpu_dai; aba611fc Sylwester Nawrocki 2017-04-21 285 bc3cf17b Sylwester Nawrocki 2019-02-14 286 /* Set capture capability only for boards with the MAX98090 CODEC */ bc3cf17b Sylwester Nawrocki 2019-02-14 287 if (codec_link->num_codecs > 1) { bc3cf17b Sylwester Nawrocki 2019-02-14 288 card->dai_link[0].dpcm_capture = 1; bc3cf17b Sylwester Nawrocki 2019-02-14 289 card->dai_link[1].dpcm_capture = 1; bc3cf17b Sylwester Nawrocki 2019-02-14 290 } a8ad0c85 Sylwester Nawrocki 2017-08-04 291 bc3cf17b Sylwester Nawrocki 2019-02-14 292 priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); a8ad0c85 Sylwester Nawrocki 2017-08-04 293 if (IS_ERR(priv->sclk_i2s)) { a8ad0c85 Sylwester Nawrocki 2017-08-04 294 ret = PTR_ERR(priv->sclk_i2s); d832d2b2 Sylwester Nawrocki 2019-02-20 295 goto err_put_cpu_dai; a8ad0c85 Sylwester Nawrocki 2017-08-04 296 } a8ad0c85 Sylwester Nawrocki 2017-08-04 297 bc3cf17b Sylwester Nawrocki 2019-02-14 @298 priv->clk_i2s_bus = of_clk_get_by_name(cpu_dai, "iis"); a8ad0c85 Sylwester Nawrocki 2017-08-04 299 if (IS_ERR(priv->clk_i2s_bus)) { a8ad0c85 Sylwester Nawrocki 2017-08-04 300 ret = PTR_ERR(priv->clk_i2s_bus); a8ad0c85 Sylwester Nawrocki 2017-08-04 301 goto err_put_sclk; a8ad0c85 Sylwester Nawrocki 2017-08-04 302 } bc3cf17b Sylwester Nawrocki 2019-02-14 303 of_node_put(cpu_dai); a8ad0c85 Sylwester Nawrocki 2017-08-04 304 aba611fc Sylwester Nawrocki 2017-04-21 305 ret = devm_snd_soc_register_card(dev, card); aba611fc Sylwester Nawrocki 2017-04-21 306 if (ret < 0) { aba611fc Sylwester Nawrocki 2017-04-21 307 dev_err(dev, "snd_soc_register_card() failed: %d\n", ret); a8ad0c85 Sylwester Nawrocki 2017-08-04 308 goto err_put_clk_i2s; aba611fc Sylwester Nawrocki 2017-04-21 309 } aba611fc Sylwester Nawrocki 2017-04-21 310 aba611fc Sylwester Nawrocki 2017-04-21 311 return 0; aba611fc Sylwester Nawrocki 2017-04-21 312 a8ad0c85 Sylwester Nawrocki 2017-08-04 313 err_put_clk_i2s: a8ad0c85 Sylwester Nawrocki 2017-08-04 314 clk_put(priv->clk_i2s_bus); a8ad0c85 Sylwester Nawrocki 2017-08-04 315 err_put_sclk: a8ad0c85 Sylwester Nawrocki 2017-08-04 316 clk_put(priv->sclk_i2s); d832d2b2 Sylwester Nawrocki 2019-02-20 317 err_put_cpu_dai: d832d2b2 Sylwester Nawrocki 2019-02-20 318 of_node_put(cpu_dai); bc3cf17b Sylwester Nawrocki 2019-02-14 319 snd_soc_of_put_dai_link_codecs(codec_link); aba611fc Sylwester Nawrocki 2017-04-21 320 return ret; aba611fc Sylwester Nawrocki 2017-04-21 321 } aba611fc Sylwester Nawrocki 2017-04-21 322 :::::: The code at line 298 was first introduced by commit :::::: bc3cf17b575a7a97b4af7ddcf86133175da7a582 ASoC: samsung: odroid: Add support for secondary CPU DAI :::::: TO: Sylwester Nawrocki <s.nawrocki(a)samsung.com> :::::: CC: Mark Brown <broonie(a)kernel.org> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation

1 0

[alsa-devel] [PATCH] ASoC: samsung: odroid: Fix of_node refcount unbalance
by Sylwester Nawrocki 20 Feb '19

20 Feb '19

In odroid_audio_probe() some OF nodes are left without reference count decrease after use. Fix it by ensuring required of_node_calls() are done before exiting probe. Reported-by: Takashi Iwai <tiwai(a)suse.de> Signed-off-by: Sylwester Nawrocki <s.nawrocki(a)samsung.com> --- sound/soc/samsung/odroid.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index bd2c5163dc7f..c3b0f6c612cb 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -257,27 +257,31 @@ static int odroid_audio_probe(struct platform_device *pdev) ret = of_parse_phandle_with_args(cpu, "sound-dai", "#sound-dai-cells", i, &args); if (ret < 0) - return ret; + break; if (!args.np) { dev_err(dev, "sound-dai property parse error: %d\n", ret); - return -EINVAL; + ret = -EINVAL; + break; } ret = snd_soc_get_dai_name(&args, &link->cpu_dai_name); of_node_put(args.np); if (ret < 0) - return ret; + break; } + if (ret == 0) + cpu_dai = of_parse_phandle(cpu, "sound-dai", 0); - cpu_dai = of_parse_phandle(cpu, "sound-dai", 0); of_node_put(cpu); of_node_put(codec); + if (ret < 0) + return ret; ret = snd_soc_of_get_dai_link_codecs(dev, codec, codec_link); if (ret < 0) - goto err_put_codec_n; + goto err_put_cpu_dai; /* Set capture capability only for boards with the MAX98090 CODEC */ if (codec_link->num_codecs > 1) { @@ -288,7 +292,7 @@ static int odroid_audio_probe(struct platform_device *pdev) priv->sclk_i2s = of_clk_get_by_name(cpu_dai, "i2s_opclk1"); if (IS_ERR(priv->sclk_i2s)) { ret = PTR_ERR(priv->sclk_i2s); - goto err_put_codec_n; + goto err_put_cpu_dai; } priv->clk_i2s_bus = of_clk_get_by_name(cpu_dai, "iis"); @@ -310,7 +314,8 @@ static int odroid_audio_probe(struct platform_device *pdev) clk_put(priv->clk_i2s_bus); err_put_sclk: clk_put(priv->sclk_i2s); -err_put_codec_n: +err_put_cpu_dai: + of_node_put(cpu_dai); snd_soc_of_put_dai_link_codecs(codec_link); return ret; } -- 2.17.1

2 1