summaryrefslogtreecommitdiffstats
path: root/sound/soc/mid-x86
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-11 13:29:24 -0700
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-04-11 13:29:24 -0700
commita19809875fb0952631767e2d2484bcd81b4365a1 (patch)
treef922fe27fd150560b079a5a140c8c7a5f39ca9ac /sound/soc/mid-x86
parent70da1dc052349b75a91fea1198258c99cea03390 (diff)
parent39cca168bdfaef9d0c496ec27f292445d6184946 (diff)
downloadlinux-a19809875fb0952631767e2d2484bcd81b4365a1.tar.bz2
Merge branch 'for-2.6.39' into for-2.6.40
Diffstat (limited to 'sound/soc/mid-x86')
-rw-r--r--sound/soc/mid-x86/sst_platform.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sound/soc/mid-x86/sst_platform.c b/sound/soc/mid-x86/sst_platform.c
index 9ba941447d41..d827edb3d544 100644
--- a/sound/soc/mid-x86/sst_platform.c
+++ b/sound/soc/mid-x86/sst_platform.c
@@ -116,18 +116,20 @@ struct snd_soc_dai_driver sst_platform_dai[] = {
static inline void sst_set_stream_status(struct sst_runtime_stream *stream,
int state)
{
- spin_lock(&stream->status_lock);
+ unsigned long flags;
+ spin_lock_irqsave(&stream->status_lock, flags);
stream->stream_status = state;
- spin_unlock(&stream->status_lock);
+ spin_unlock_irqrestore(&stream->status_lock, flags);
}
static inline int sst_get_stream_status(struct sst_runtime_stream *stream)
{
int state;
+ unsigned long flags;
- spin_lock(&stream->status_lock);
+ spin_lock_irqsave(&stream->status_lock, flags);
state = stream->stream_status;
- spin_unlock(&stream->status_lock);
+ spin_unlock_irqrestore(&stream->status_lock, flags);
return state;
}