diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-09-11 19:26:04 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-09-11 19:26:04 +0300 |
| commit | 8949b6660c3c7947a9b696c97eb85a32abe4a2d7 (patch) | |
| tree | d4593b3d4624b0fbceb22a38e26465bca1711d5a /sound/soc/codecs/rt1308-sdw.c | |
| parent | fc19d559b0d31b5b831fd468b10d7dadafc0d0ec (diff) | |
| parent | 1a5ce48fd667128e369fdc7fb87e21539aed21b5 (diff) | |
| download | linux-8949b6660c3c7947a9b696c97eb85a32abe4a2d7.tar.xz | |
Merge tag 'asoc-fix-v5.9-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.9
Most of this is various driver specific fixes, none of which are
terribly exciting in themselves, plus one core fix adding and using a
new DAI lookup function to deal with a lockdep warning.
Diffstat (limited to 'sound/soc/codecs/rt1308-sdw.c')
| -rw-r--r-- | sound/soc/codecs/rt1308-sdw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c index b0ba0d2acbdd..56e952a904a3 100644 --- a/sound/soc/codecs/rt1308-sdw.c +++ b/sound/soc/codecs/rt1308-sdw.c @@ -684,8 +684,8 @@ static int rt1308_sdw_probe(struct sdw_slave *slave, /* Regmap Initialization */ regmap = devm_regmap_init_sdw(slave, &rt1308_sdw_regmap); - if (!regmap) - return -EINVAL; + if (IS_ERR(regmap)) + return PTR_ERR(regmap); rt1308_sdw_init(&slave->dev, regmap, slave); |