diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-07-01 08:34:15 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-07-01 08:34:15 +0200 |
| commit | 498386d1c4d98a72db7a2f51473593ad563b45ae (patch) | |
| tree | f94e6b211b9a50106e6e047cd992ae3e209ef007 /sound/soc/codecs/rt1316-sdw.c | |
| parent | 5c6d4f97267f02f47acea8a652265348ec12de51 (diff) | |
| parent | dfc2e8ae4066a95c7f9c2bb2dfa26651feaa6b83 (diff) | |
| download | lwn-498386d1c4d98a72db7a2f51473593ad563b45ae.tar.gz lwn-498386d1c4d98a72db7a2f51473593ad563b45ae.zip | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/codecs/rt1316-sdw.c')
| -rw-r--r-- | sound/soc/codecs/rt1316-sdw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt1316-sdw.c b/sound/soc/codecs/rt1316-sdw.c index 3b029c56467d..09b4914bba1b 100644 --- a/sound/soc/codecs/rt1316-sdw.c +++ b/sound/soc/codecs/rt1316-sdw.c @@ -701,7 +701,7 @@ static int __maybe_unused rt1316_dev_resume(struct device *dev) struct rt1316_sdw_priv *rt1316 = dev_get_drvdata(dev); unsigned long time; - if (!rt1316->hw_init) + if (!rt1316->first_hw_init) return 0; if (!slave->unattach_request) |