diff --git a/[refs] b/[refs] index 4608c8937004..06f077b96ea1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de1e37b7d0dc3f1b8d0f84f5ff64ef8eebdf1e9f +refs/heads/master: aa88a3553eebdcc3ce6801aabb4ed0223bfa198e diff --git a/trunk/sound/pci/hda/hda_codec.c b/trunk/sound/pci/hda/hda_codec.c index 23c821428a43..3207e5c57141 100644 --- a/trunk/sound/pci/hda/hda_codec.c +++ b/trunk/sound/pci/hda/hda_codec.c @@ -1955,6 +1955,7 @@ void snd_hda_codec_resume_amp(struct hda_codec *codec) int i; mutex_lock(&codec->hash_mutex); + codec->cached_write = 0; for (i = 0; i < codec->amp_cache.buf.used; i++) { struct hda_amp_info *buffer; u32 key; @@ -3520,6 +3521,7 @@ void snd_hda_codec_resume_cache(struct hda_codec *codec) int i; mutex_lock(&codec->hash_mutex); + codec->cached_write = 0; for (i = 0; i < codec->cmd_cache.buf.used; i++) { struct hda_cache_head *buffer; u32 key;