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

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

diff --git a/kernel/sound/soc/codecs/ak4641.c b/kernel/sound/soc/codecs/ak4641.c
index 81b54a2..b14176f 100644 (file)
--- a/kernel/sound/soc/codecs/ak4641.c
+++ b/kernel/sound/soc/codecs/ak4641.c
@@ -412,7 +412,7 @@ static int ak4641_set_bias_level(struct snd_soc_codec *codec,
                snd_soc_update_bits(codec, AK4641_DAC, 0x20, 0x20);
                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) {
                        if (pdata && gpio_is_valid(pdata->gpio_power))
                                gpio_set_value(pdata->gpio_power, 1);
                        mdelay(1);
@@ -439,7 +439,6 @@ static int ak4641_set_bias_level(struct snd_soc_codec *codec,
                regcache_mark_dirty(ak4641->regmap);
                break;
        }
-       codec->dapm.bias_level = level;
        return 0;
 }
 
@@ -610,7 +609,6 @@ MODULE_DEVICE_TABLE(i2c, ak4641_i2c_id);
 static struct i2c_driver ak4641_i2c_driver = {
        .driver = {
                .name = "ak4641",
-               .owner = THIS_MODULE,
        },
        .probe =    ak4641_i2c_probe,
        .remove =   ak4641_i2c_remove,