diff options
| author | Takashi Iwai <tiwai@suse.de> | 2020-01-11 09:03:32 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2020-01-11 09:03:40 +0100 |
| commit | 3cdca6d62b8e948ca9c148deec7424b664d50cd9 (patch) | |
| tree | 836c59f119343ab509ce5a7cb0c706000fe19369 /sound/hda/hdac_regmap.c | |
| parent | 1a0986c1bc14a6a05da9d9cdeb61833560bacb1e (diff) | |
| parent | 7fba6aea4472f01a404d81a12237ae9a1ff418ce (diff) | |
| download | linux-stable-3cdca6d62b8e948ca9c148deec7424b664d50cd9.tar.gz linux-stable-3cdca6d62b8e948ca9c148deec7424b664d50cd9.tar.bz2 linux-stable-3cdca6d62b8e948ca9c148deec7424b664d50cd9.zip | |
Merge branch 'for-linus' into for-next
Sync 5.5-devel branch once again for applying the HD-audio fixes.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/hda/hdac_regmap.c')
| -rw-r--r-- | sound/hda/hdac_regmap.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c index d771d2cfdef7..0c8188a48a00 100644 --- a/sound/hda/hdac_regmap.c +++ b/sound/hda/hdac_regmap.c @@ -363,7 +363,6 @@ static const struct regmap_config hda_regmap_cfg = { .reg_write = hda_reg_write, .use_single_read = true, .use_single_write = true, - .disable_locking = true, }; /** |