aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sound/soc/soc-core.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 6cee97e23da6..63c80e634a37 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3051,8 +3051,11 @@ int snd_soc_register_dais(struct device *dev,
3051 } 3051 }
3052 3052
3053 dai->dev = dev; 3053 dai->dev = dev;
3054 dai->id = i;
3055 dai->driver = &dai_drv[i]; 3054 dai->driver = &dai_drv[i];
3055 if (dai->driver->id)
3056 dai->id = dai->driver->id;
3057 else
3058 dai->id = i;
3056 if (!dai->driver->ops) 3059 if (!dai->driver->ops)
3057 dai->driver->ops = &null_dai_ops; 3060 dai->driver->ops = &null_dai_ops;
3058 3061