diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-11-24 05:59:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-11-24 05:59:14 +0100 |
| commit | b006fc9486cca7c3ede476d4088fee496e47f126 (patch) | |
| tree | 8f6707f923e54fa28201630cb5179f06cb283726 | |
| parent | 0b5787be048f777b27a06299ecda750e2734c7a8 (diff) | |
| download | alsa-driver-build-unstable-b006fc9486cca7c3ede476d4088fee496e47f126.tar.gz | |
Regenerate ascore/sound.patch
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | acore/sound.patch | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/acore/sound.patch b/acore/sound.patch index d7d213308..b5b01ae16 100644 --- a/acore/sound.patch +++ b/acore/sound.patch @@ -1,5 +1,5 @@ ---- ../alsa-kernel/core/sound.c 2010-11-02 16:17:52.267995721 +0100 -+++ sound.c 2010-11-02 16:41:56.188267664 +0100 +--- ../alsa-kernel/core/sound.c 2010-11-23 16:34:51.707696176 +0100 ++++ sound.c 2010-11-24 05:58:55.105647343 +0100 @@ -1,3 +1,4 @@ +#include "adriver.h" /* @@ -36,7 +36,7 @@ .open = snd_open, .llseek = noop_llseek, }; -@@ -260,7 +270,11 @@ +@@ -268,7 +278,11 @@ if (snd_BUG_ON(!name)) return -EINVAL; @@ -48,7 +48,7 @@ if (preg == NULL) return -ENOMEM; preg->type = type; -@@ -268,6 +282,9 @@ +@@ -276,6 +290,9 @@ preg->device = dev; preg->f_ops = f_ops; preg->private_data = private_data; @@ -57,8 +57,8 @@ +#endif mutex_lock(&sound_mutex); #ifdef CONFIG_SND_DYNAMIC_MINORS - minor = snd_find_free_minor(); -@@ -282,8 +299,23 @@ + minor = snd_find_free_minor(type); +@@ -290,8 +307,23 @@ return minor; } snd_minors[minor] = preg; @@ -82,7 +82,7 @@ if (IS_ERR(preg->dev)) { snd_minors[minor] = NULL; mutex_unlock(&sound_mutex); -@@ -291,6 +323,22 @@ +@@ -299,6 +331,22 @@ kfree(preg); return minor; } @@ -105,7 +105,7 @@ mutex_unlock(&sound_mutex); return 0; -@@ -330,6 +378,9 @@ +@@ -338,6 +386,9 @@ int snd_unregister_device(int type, struct snd_card *card, int dev) { int minor; @@ -115,7 +115,7 @@ mutex_lock(&sound_mutex); minor = find_snd_minor(type, card, dev); -@@ -338,7 +389,20 @@ +@@ -346,7 +397,20 @@ return -EINVAL; } @@ -136,7 +136,7 @@ kfree(snd_minors[minor]); snd_minors[minor] = NULL; -@@ -351,16 +415,28 @@ +@@ -359,16 +423,28 @@ int snd_add_device_sysfs_file(int type, struct snd_card *card, int dev, struct device_attribute *attr) { @@ -166,7 +166,7 @@ } EXPORT_SYMBOL(snd_add_device_sysfs_file); -@@ -446,31 +522,80 @@ +@@ -454,31 +530,80 @@ * INIT PART */ |