git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'v2.6.39-rc3' into for-2.6.39
[pandora-kernel.git]
/
sound
/
soc
/
mid-x86
/
sst_platform.c
diff --git
a/sound/soc/mid-x86/sst_platform.c
b/sound/soc/mid-x86/sst_platform.c
index
b2e9198
..
d567c32
100644
(file)
--- 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)
{
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;
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;
}
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;
state = stream->stream_status;
- spin_unlock
(&stream->status_lock
);
+ spin_unlock
_irqrestore(&stream->status_lock, flags
);
return state;
}
return state;
}