diff options
| author | Mark Brown <broonie@kernel.org> | 2022-07-11 16:51:01 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-07-11 16:51:01 +0200 |
| commit | 39c5c44fc451c083908e77c3b2762fae2bf8acca (patch) | |
| tree | 6e3c05c56e48fa9d29ad1f89614e9f0ef48459d4 /sound/soc/rockchip/rockchip_i2s.c | |
| parent | ASoC: fsl_utils: Drop usage of __clk_get_name() (diff) | |
| parent | ASoC: rockchip: i2s: Fix NULL pointer dereference when pinctrl is not found (diff) | |
| download | linux-39c5c44fc451c083908e77c3b2762fae2bf8acca.tar.xz linux-39c5c44fc451c083908e77c3b2762fae2bf8acca.zip | |
ASoC: Merge up fixes
Needed for the Rockchip driver.
Diffstat (limited to 'sound/soc/rockchip/rockchip_i2s.c')
| -rw-r--r-- | sound/soc/rockchip/rockchip_i2s.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/rockchip/rockchip_i2s.c b/sound/soc/rockchip/rockchip_i2s.c index ee33c5d2e948..f5f3540a9e18 100644 --- a/sound/soc/rockchip/rockchip_i2s.c +++ b/sound/soc/rockchip/rockchip_i2s.c @@ -803,7 +803,6 @@ static int rockchip_i2s_probe(struct platform_device *pdev) i2s->bclk_ratio = 64; i2s->pinctrl = devm_pinctrl_get(&pdev->dev); - if (!IS_ERR(i2s->pinctrl)) { i2s->bclk_on = pinctrl_lookup_state(i2s->pinctrl, "bclk_on"); if (!IS_ERR_OR_NULL(i2s->bclk_on)) { |