diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2018-11-21 03:09:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-11-21 14:28:19 +0100 |
| commit | f31a17105560f5f074f4d26fd5469a221f50af18 (patch) | |
| tree | c4f1fd80f734ee43bd67d142d65eb9abd70805b1 /sound/soc/generic/simple-card-utils.c | |
| parent | ASoC: simple-card-utils: remove asoc_simple_card_clk_register() (diff) | |
| download | linux-f31a17105560f5f074f4d26fd5469a221f50af18.tar.xz linux-f31a17105560f5f074f4d26fd5469a221f50af18.zip | |
ASoC: simple-card-utils: accept NULL parameter on asoc_simple_card_xxx()
If simple-card-utils accept NULL pointer on asoc_simple_card_xxx(),
each driver code will be more simple.
Let's accept NULL pointer.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to '')
| -rw-r--r-- | sound/soc/generic/simple-card-utils.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index 996bfe42bc8d..f3183a4718b3 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -153,13 +153,17 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name); int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai) { - return clk_prepare_enable(dai->clk); + if (dai) + return clk_prepare_enable(dai->clk); + + return 0; } EXPORT_SYMBOL_GPL(asoc_simple_card_clk_enable); void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai) { - clk_disable_unprepare(dai->clk); + if (dai) + clk_disable_unprepare(dai->clk); } EXPORT_SYMBOL_GPL(asoc_simple_card_clk_disable); @@ -342,6 +346,9 @@ int asoc_simple_card_init_dai(struct snd_soc_dai *dai, { int ret; + if (!simple_dai) + return 0; + if (simple_dai->sysclk) { ret = snd_soc_dai_set_sysclk(dai, 0, simple_dai->sysclk, simple_dai->clk_direction); |