AC97 driver needs to make kobject with id which from codec. But in multi-component, this id was removed, so this patch fix this same as 'sound/pci/ac97/ac97_codec.c'.

Signed-off-by: Seungwhan Youn sw.youn@samsung.com --- sound/soc/soc-core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 23dad36..d074b2b 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -310,7 +310,7 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec) codec->ac97->dev.release = soc_ac97_device_release;

dev_set_name(&codec->ac97->dev, "%d-%d:%s", - codec->id, 0, codec->name); + codec->ac97->bus->card->number, 0, codec->name); err = device_register(&codec->ac97->dev); if (err < 0) { snd_printk(KERN_ERR "Can't register ac97 bus\n");