diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-11 18:14:34 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-11 18:14:34 -0500 |
| commit | a1152e3570e271dbf217391d549d3e47e258fe05 (patch) | |
| tree | f3447447b2ccf22bba37f64c1a301b66f3984911 | |
| parent | 0852d7a654f75d22a3c09fd7da4a3551bbb37740 (diff) | |
| parent | 26a74f1f61c5bba1c0b46e67e91e921e941f76d7 (diff) | |
Merge branch 'fix/hda' into topic/hda
| -rw-r--r-- | sound/pci/hda/hda_hwdep.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_hwdep.c b/sound/pci/hda/hda_hwdep.c index 300ab407cf42..482fb0304ca9 100644 --- a/sound/pci/hda/hda_hwdep.c +++ b/sound/pci/hda/hda_hwdep.c | |||
| @@ -175,7 +175,7 @@ static int reconfig_codec(struct hda_codec *codec) | |||
| 175 | err = snd_hda_codec_build_controls(codec); | 175 | err = snd_hda_codec_build_controls(codec); |
| 176 | if (err < 0) | 176 | if (err < 0) |
| 177 | return err; | 177 | return err; |
| 178 | return 0; | 178 | return snd_card_register(codec->bus->card); |
| 179 | } | 179 | } |
| 180 | 180 | ||
| 181 | /* | 181 | /* |