These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / codecs / wm8580.c

diff --git a/kernel/sound/soc/codecs/wm8580.c b/kernel/sound/soc/codecs/wm8580.c
index 0a887c5..66602bf 100644 (file)
--- a/kernel/sound/soc/codecs/wm8580.c
+++ b/kernel/sound/soc/codecs/wm8580.c
@@ -795,7 +795,7 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec,
                break;
 
        case SND_SOC_BIAS_STANDBY:
-               if (codec->dapm.bias_level == SND_SOC_BIAS_OFF) {
+               if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) {
                        /* Power up and get individual control of the DACs */
                        snd_soc_update_bits(codec, WM8580_PWRDN1,
                                            WM8580_PWRDN1_PWDN |
@@ -812,7 +812,6 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec,
                                    WM8580_PWRDN1_PWDN, WM8580_PWRDN1_PWDN);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -917,6 +916,7 @@ static const struct of_device_id wm8580_of_match[] = {
        { .compatible = "wlf,wm8580" },
        { },
 };
+MODULE_DEVICE_TABLE(of, wm8580_of_match);
 
 static const struct regmap_config wm8580_regmap = {
        .reg_bits = 7,
@@ -979,7 +979,6 @@ MODULE_DEVICE_TABLE(i2c, wm8580_i2c_id);
 static struct i2c_driver wm8580_i2c_driver = {
        .driver = {
                .name = "wm8580",
-               .owner = THIS_MODULE,
                .of_match_table = wm8580_of_match,
        },
        .probe =    wm8580_i2c_probe,