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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[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
ee2c224
..
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;
}
@@
-440,7
+442,7
@@
static int sst_platform_remove(struct platform_device *pdev)
snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai));
snd_soc_unregister_platform(&pdev->dev);
snd_soc_unregister_dais(&pdev->dev, ARRAY_SIZE(sst_platform_dai));
snd_soc_unregister_platform(&pdev->dev);
- pr_debug("sst_platform_remove sucess\n");
+ pr_debug("sst_platform_remove suc
c
ess\n");
return 0;
}
return 0;
}
@@
-463,7
+465,7
@@
module_init(sst_soc_platform_init);
static void __exit sst_soc_platform_exit(void)
{
platform_driver_unregister(&sst_platform_driver);
static void __exit sst_soc_platform_exit(void)
{
platform_driver_unregister(&sst_platform_driver);
- pr_debug("sst_soc_platform_exit sucess\n");
+ pr_debug("sst_soc_platform_exit suc
c
ess\n");
}
module_exit(sst_soc_platform_exit);
}
module_exit(sst_soc_platform_exit);