diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-15 03:00:18 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-15 03:00:18 -0500 |
| commit | b69bc3967445169ea4dc11171118b414eafab271 (patch) | |
| tree | 52bff205f1fc1dbcae5aba7531c5b53f52b4823e /sound/pci/hda/hda_hwdep.c | |
| parent | c466ed2e4337c5eb03b283da507eb5328ab06c73 (diff) | |
| parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) | |
Merge commit 'v2.6.29-rc5' into x86/apic
Diffstat (limited to 'sound/pci/hda/hda_hwdep.c')
| -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 | /* |