diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-09-11 16:46:36 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-09-11 16:46:36 +0200 |
| commit | 05288426908ecb7ed7cbff61901db5918525578a (patch) | |
| tree | 94a814cfdd53a011a10da09201ed08a6572175ff /sound/pci/hda/hda_codec.c | |
| parent | b35aabd78ddae8300fda7e6a1ac6f0484ef3e804 (diff) | |
| parent | c302d6133c094bda7a7ce94eac5b50c018a7ca7b (diff) | |
Merge branch 'for-linus' into for-next
To merge HD-audio fixes back to 3.7 development line
Diffstat (limited to 'sound/pci/hda/hda_codec.c')
| -rw-r--r-- | sound/pci/hda/hda_codec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c index ff97cf3e8ba..d71d101e929 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -2368,6 +2368,7 @@ int snd_hda_codec_reset(struct hda_codec *codec) } if (codec->patch_ops.free) codec->patch_ops.free(codec); + memset(&codec->patch_ops, 0, sizeof(codec->patch_ops)); snd_hda_jack_tbl_clear(codec); codec->proc_widget_hook = NULL; codec->spec = NULL; @@ -2383,7 +2384,6 @@ int snd_hda_codec_reset(struct hda_codec *codec) codec->num_pcms = 0; codec->pcm_info = NULL; codec->preset = NULL; - memset(&codec->patch_ops, 0, sizeof(codec->patch_ops)); codec->slave_dig_outs = NULL; codec->spdif_status_reset = 0; module_put(codec->owner); |