projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-fixes-3.8' of git://people.freedesktop.org/~agd5f/linux into drm...
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
sound
/
soc
/
soc-compress.c
diff --git
a/sound/soc/soc-compress.c
b/sound/soc/soc-compress.c
index
967d0e1
..
5fbfb06
100644
(file)
--- a/
sound/soc/soc-compress.c
+++ b/
sound/soc/soc-compress.c
@@
-113,7
+113,7
@@
static int soc_compr_free(struct snd_compr_stream *cstream)
SNDRV_PCM_STREAM_PLAYBACK,
SND_SOC_DAPM_STREAM_STOP);
} else
-
codec_dai
->pop_wait = 1;
+
rtd
->pop_wait = 1;
schedule_delayed_work(&rtd->delayed_work,
msecs_to_jiffies(rtd->pmdown_time));
} else {