Skip to content

Commit 3421762

Browse files
KonstaTpelwell
authored andcommitted
fixup! ASoC: Add support for all the downstream rpi sound card drivers
* Change SND_PIMIDI and SND_PISOUND_MICRO to select CRC8 instead of depend on it. * Fixes build with Clang. sound/drivers/upisnd/upisnd_codec.c:741:6: error: variable 'ret' is used uninitialized whenever 'if' condition is false [-Werror,-Wsometimes-uninitialized] 741 | if (adau->clk_src != ADAU1961_CLK_SRC_MCLK) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/drivers/upisnd/upisnd_codec.c:744:9: note: uninitialized use occurs here 744 | return ret; | ^~~ sound/drivers/upisnd/upisnd_codec.c:741:2: note: remove the 'if' if its condition is always true 741 | if (adau->clk_src != ADAU1961_CLK_SRC_MCLK) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 742 | ret = snd_soc_dapm_add_routes(dapm, &adau1961_dapm_pll_route, 1); sound/drivers/upisnd/upisnd_codec.c:739:9: note: initialize the variable 'ret' to silence this warning 739 | int ret; | ^ | = 0 1 error generated.
1 parent 6b40fa8 commit 3421762

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

sound/drivers/Kconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,9 @@ config SND_AC97_POWER_SAVE_DEFAULT
265265

266266
config SND_PIMIDI
267267
tristate "Pimidi driver"
268-
depends on SND_SEQUENCER && CRC8
268+
depends on SND_SEQUENCER
269269
select SND_RAWMIDI
270+
select CRC8
270271
help
271272
Say Y here to include support for Blokas Pimidi.
272273

@@ -275,7 +276,8 @@ config SND_PIMIDI
275276

276277
config SND_PISOUND_MICRO
277278
tristate "Pisound Micro driver"
278-
depends on SND_SEQUENCER && CRC8
279+
depends on SND_SEQUENCER
280+
select CRC8
279281
help
280282
Say Y here to include support for Blokas Pisound Micro.
281283

sound/drivers/upisnd/upisnd_codec.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ static int adau1961_add_routes(struct snd_soc_component *component)
736736
{
737737
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
738738
struct adau *adau = snd_soc_component_get_drvdata(component);
739-
int ret;
739+
int ret = 0;
740740

741741
if (adau->clk_src != ADAU1961_CLK_SRC_MCLK)
742742
ret = snd_soc_dapm_add_routes(dapm, &adau1961_dapm_pll_route, 1);

0 commit comments

Comments
 (0)