Merge branch 'for-linus' into for-next

[thirdparty/linux.git] / sound / hda / hdac_regmap.c

diff --git a/sound/hda/hdac_regmap.c b/sound/hda/hdac_regmap.c
index d771d2cfdef75107756c1e4220f2c16d72a17c33..0c8188a48a00fd2a1a2b69a6c22a43e04cc4f2ac 100644 (file)
--- 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,
 };
 
 /**