diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /sound/soc/soc-core.c | |
| parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'sound/soc/soc-core.c')
| -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 00fccdd41bb0..13b4aaff0e9c 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c | |||
| @@ -88,8 +88,8 @@ static int soc_ac97_dev_register(struct snd_soc_codec *codec) | |||
| 88 | codec->ac97->dev.parent = NULL; | 88 | codec->ac97->dev.parent = NULL; |
| 89 | codec->ac97->dev.release = soc_ac97_device_release; | 89 | codec->ac97->dev.release = soc_ac97_device_release; |
| 90 | 90 | ||
| 91 | snprintf(codec->ac97->dev.bus_id, BUS_ID_SIZE, "%d-%d:%s", | 91 | dev_set_name(&codec->ac97->dev, "%d-%d:%s", |
| 92 | codec->card->number, 0, codec->name); | 92 | codec->card->number, 0, codec->name); |
| 93 | err = device_register(&codec->ac97->dev); | 93 | err = device_register(&codec->ac97->dev); |
| 94 | if (err < 0) { | 94 | if (err < 0) { |
| 95 | snd_printk(KERN_ERR "Can't register ac97 bus\n"); | 95 | snd_printk(KERN_ERR "Can't register ac97 bus\n"); |