Merge tag 'sound-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[sfrench/cifs-2.6.git] / sound / soc / codecs / rt274.c

diff --git a/sound/soc/codecs/rt274.c b/sound/soc/codecs/rt274.c
index ab093bdb55523e81a6f9b4dfb6313a35d4943d44..f2c50b11e4d0c734a462fc9a2bf729e0454f1e56 100644 (file)
--- a/sound/soc/codecs/rt274.c
+++ b/sound/soc/codecs/rt274.c
@@ -980,14 +980,11 @@ static int rt274_probe(struct snd_soc_component *component)
        struct rt274_priv *rt274 = snd_soc_component_get_drvdata(component);
 
        rt274->component = component;
+       INIT_DELAYED_WORK(&rt274->jack_detect_work, rt274_jack_detect_work);
 
-       if (rt274->i2c->irq) {
-               INIT_DELAYED_WORK(&rt274->jack_detect_work,
-                                       rt274_jack_detect_work);
+       if (rt274->i2c->irq)
                schedule_delayed_work(&rt274->jack_detect_work,
-                                       msecs_to_jiffies(1250));
-       }
-
+                                     msecs_to_jiffies(1250));
        return 0;
 }
 
@@ -996,6 +993,7 @@ static void rt274_remove(struct snd_soc_component *component)
        struct rt274_priv *rt274 = snd_soc_component_get_drvdata(component);
 
        cancel_delayed_work_sync(&rt274->jack_detect_work);
+       rt274->component = NULL;
 }
 
 #ifdef CONFIG_PM
@@ -1075,7 +1073,6 @@ static const struct snd_soc_component_driver soc_component_dev_rt274 = {
        .num_dapm_routes        = ARRAY_SIZE(rt274_dapm_routes),
        .use_pmdown_time        = 1,
        .endianness             = 1,
-       .non_legacy_dai_naming  = 1,
 };
 
 static const struct regmap_config rt274_regmap = {