diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-02-14 17:19:21 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-02-14 17:19:21 +0100 |
| commit | 94ede6e3802d15d2df05639e4245b7c09d1f0145 (patch) | |
| tree | 651b462f3ab8bcec8723ae9acd2bb813e8c7c5bd | |
| parent | 0e2c4deaafbc89f274f1bab7c588ed39d09af8bf (diff) | |
| download | alsa-driver-build-unstable-94ede6e3802d15d2df05639e4245b7c09d1f0145.tar.gz | |
Regenerate ac97_codec.patch and soc-core.patch to resolve fuzz
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | pci/ac97/ac97_codec.patch | 12 | ||||
| -rw-r--r-- | soc/soc-core.patch | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/pci/ac97/ac97_codec.patch b/pci/ac97/ac97_codec.patch index e76e90a11..e0ccee41a 100644 --- a/pci/ac97/ac97_codec.patch +++ b/pci/ac97/ac97_codec.patch @@ -1,5 +1,5 @@ ---- ../../alsa-kernel/pci/ac97/ac97_codec.c 2009-12-15 22:08:58.000000000 +0100 -+++ ac97_codec.c 2009-12-15 22:17:51.000000000 +0100 +--- ../../alsa-kernel/pci/ac97/ac97_codec.c 2011-01-14 19:15:32.917831053 +0100 ++++ ac97_codec.c 2011-02-14 17:17:05.284425871 +0100 @@ -1,3 +1,4 @@ +#include "adriver.h" /* @@ -17,7 +17,7 @@ MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>"); MODULE_DESCRIPTION("Universal interface for Audio Codec '97"); -@@ -1917,6 +1918,7 @@ +@@ -1926,6 +1927,7 @@ EXPORT_SYMBOL(snd_ac97_bus); @@ -25,7 +25,7 @@ /* stop no dev release warning */ static void ac97_device_release(struct device * dev) { -@@ -1928,7 +1930,9 @@ +@@ -1937,7 +1939,9 @@ struct snd_ac97 *ac97 = device->device_data; int err; @@ -35,7 +35,7 @@ ac97->dev.parent = ac97->bus->card->dev; ac97->dev.release = ac97_device_release; dev_set_name(&ac97->dev, "%d-%d:%s", -@@ -1950,6 +1954,10 @@ +@@ -1959,6 +1963,10 @@ device_unregister(&ac97->dev); return 0; } @@ -45,4 +45,4 @@ +#endif /* build_ops to do nothing */ - static struct snd_ac97_build_ops null_build_ops; + static const struct snd_ac97_build_ops null_build_ops; diff --git a/soc/soc-core.patch b/soc/soc-core.patch index ca73504a6..477dee216 100644 --- a/soc/soc-core.patch +++ b/soc/soc-core.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/soc/soc-core.c 2011-02-01 17:32:46.000000000 +0100 -+++ soc-core.c 2011-02-01 22:17:09.940322428 +0100 +--- ../alsa-kernel/soc/soc-core.c 2011-02-08 17:32:02.153652411 +0100 ++++ soc-core.c 2011-02-14 17:17:06.144459431 +0100 @@ -1,3 +1,8 @@ +#include "adriver.h" +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) @@ -9,7 +9,7 @@ /* * soc-core.c -- ALSA SoC Audio Layer * -@@ -991,6 +996,11 @@ +@@ -1027,6 +1032,11 @@ .pointer = soc_pcm_pointer, }; @@ -21,8 +21,8 @@ #ifdef CONFIG_PM_SLEEP /* powers down audio subsystem for suspend */ int snd_soc_suspend(struct device *dev) -@@ -1506,7 +1516,9 @@ - rtd->card = card; +@@ -1542,7 +1552,9 @@ + rtd->codec = codec; rtd->dev.parent = card->dev; rtd->dev.release = rtd_release; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) @@ -31,7 +31,7 @@ ret = device_register(&rtd->dev); if (ret < 0) { dev_err(card->dev, -@@ -1972,21 +1984,43 @@ +@@ -2008,21 +2020,43 @@ } EXPORT_SYMBOL_GPL(snd_soc_poweroff); |