diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-10 15:42:42 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-10 15:42:42 +0200 |
| commit | 10579acf551b808115c31a1fa503667cbcbf4fc3 (patch) | |
| tree | fe87a24b003e70b79c4797a9dba9767920812a86 | |
| parent | 22657a16971efd68d6c886855b6b88c32848c3bf (diff) | |
| download | alsa-driver-build-unstable-10579acf551b808115c31a1fa503667cbcbf4fc3.tar.gz | |
Regenerated soc-core.patch to fix fuzz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | soc/soc-core.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/soc/soc-core.patch b/soc/soc-core.patch index 9d22bc9a2..91f274324 100644 --- a/soc/soc-core.patch +++ b/soc/soc-core.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/soc/soc-core.c 2011-04-19 08:29:42.000000000 +0200 -+++ soc-core.c 2011-04-19 09:03:08.000000000 +0200 +--- ../alsa-kernel/soc/soc-core.c 2011-06-10 14:18:58.881904062 +0200 ++++ soc-core.c 2011-06-10 15:40:48.776206466 +0200 @@ -1,3 +1,8 @@ +#include "adriver.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) @@ -9,29 +9,29 @@ /* * soc-core.c -- ALSA SoC Audio Layer * -@@ -1037,6 +1042,11 @@ - .pointer = soc_pcm_pointer, - }; - -+/* XXX */ -+#if !defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM) -+#define CONFIG_PM_SLEEP -+#endif -+ - #ifdef CONFIG_PM_SLEEP - /* powers down audio subsystem for suspend */ - int snd_soc_suspend(struct device *dev) -@@ -1573,7 +1583,9 @@ +@@ -1031,7 +1036,9 @@ rtd->codec = codec; rtd->dev.parent = card->dev; rtd->dev.release = rtd_release; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) rtd->dev.init_name = name; +#endif + mutex_init(&rtd->pcm_mutex); ret = device_register(&rtd->dev); if (ret < 0) { - dev_err(card->dev, -@@ -2077,22 +2089,44 @@ +@@ -1345,6 +1352,11 @@ + snd_soc_dapm_debugfs_init(&card->dapm, card->debugfs_card_root); + #endif + ++/* XXX */ ++#if !defined(CONFIG_PM_SLEEP) && defined(CONFIG_PM) ++#define CONFIG_PM_SLEEP ++#endif ++ + #ifdef CONFIG_PM_SLEEP + /* deferred resume work */ + INIT_WORK(&card->deferred_resume_work, soc_resume_deferred); +@@ -1547,22 +1559,44 @@ } EXPORT_SYMBOL_GPL(snd_soc_poweroff); @@ -75,4 +75,4 @@ +#endif }; - /* create a new pcm */ + /** |