diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-11-07 03:06:05 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-11-07 03:06:05 -0500 |
| commit | 63cf123bf5d538a066e4a899390c9ce56ab6df9f (patch) | |
| tree | 00a5e6eabcfdd310247018188f8ebe35b8b6f1ba /sound/soc | |
| parent | 6834d7ce224a6f6a1dd05da3a867730c40943154 (diff) | |
| parent | fcef7836a31c6432b41a38867d413ed3d6aa8261 (diff) | |
Merge branch 'topic/fix/misc' into topic/misc
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 462e635dfc74..0af3bbde5bbe 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -95,8 +95,8 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec) | |||
| 95 | codec->ac97->dev.parent = NULL; | 95 | codec->ac97->dev.parent = NULL; |
| 96 | codec->ac97->dev.release = soc_ac97_device_release; | 96 | codec->ac97->dev.release = soc_ac97_device_release; |
| 97 | 97 | ||
| 98 | snprintf(codec->ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s", | 98 | dev_set_name(&codec->ac97->dev, "%d-%d:%s", |
| 99 | codec->card->number, 0, codec->name); | 99 | codec->card->number, 0, codec->name); |
| 100 | err = device_register(&codec->ac97->dev); | 100 | err = device_register(&codec->ac97->dev); |
| 101 | if (err < 0) { | 101 | if (err < 0) { |
| 102 | snd_printk(KERN_ERR "Can't register ac97 bus\n"); | 102 | snd_printk(KERN_ERR "Can't register ac97 bus\n"); |