projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core/topology' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
sound
/
sound_core.c
diff --git
a/sound/sound_core.c
b/sound/sound_core.c
index 5322c50c9617c2f8aa0850b60e873a5caef26c2d..dcfc1d5ce63173e5c636cc344d391889a1236611 100644
(file)
--- a/
sound/sound_core.c
+++ b/
sound/sound_core.c
@@
-37,6
+37,7
@@
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/slab.h>
+#include <linux/smp_lock.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/fs.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/fs.h>
@@
-170,8
+171,8
@@
static int sound_insert_unit(struct sound_unit **list, const struct file_operati
else
sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
else
sprintf(s->name, "sound/%s%d", name, r / SOUND_STEP);
-
class_device_create(sound_class, NULL
, MKDEV(SOUND_MAJOR, s->unit_minor),
-
dev,
s->name+6);
+
device_create(sound_class, dev
, MKDEV(SOUND_MAJOR, s->unit_minor),
+ s->name+6);
return r;
fail:
return r;
fail:
@@
-193,7
+194,7
@@
static void sound_remove_unit(struct sound_unit **list, int unit)
p = __sound_remove_unit(list, unit);
spin_unlock(&sound_loader_lock);
if (p) {
p = __sound_remove_unit(list, unit);
spin_unlock(&sound_loader_lock);
if (p) {
-
class_
device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor));
+ device_destroy(sound_class, MKDEV(SOUND_MAJOR, p->unit_minor));
kfree(p);
}
}
kfree(p);
}
}
@@
-436,7
+437,7
@@
EXPORT_SYMBOL(unregister_sound_dsp);
static int soundcore_open(struct inode *, struct file *);
static int soundcore_open(struct inode *, struct file *);
-static struct file_operations soundcore_fops=
+static
const
struct file_operations soundcore_fops=
{
/* We must have an owner or the module locking fails */
.owner = THIS_MODULE,
{
/* We must have an owner or the module locking fails */
.owner = THIS_MODULE,
@@
-464,6
+465,8
@@
int soundcore_open(struct inode *inode, struct file *file)
struct sound_unit *s;
const struct file_operations *new_fops = NULL;
struct sound_unit *s;
const struct file_operations *new_fops = NULL;
+ lock_kernel ();
+
chain=unit&0x0F;
if(chain==4 || chain==5) /* dsp/audio/dsp16 */
{
chain=unit&0x0F;
if(chain==4 || chain==5) /* dsp/audio/dsp16 */
{
@@
-511,9
+514,11
@@
int soundcore_open(struct inode *inode, struct file *file)
file->f_op = fops_get(old_fops);
}
fops_put(old_fops);
file->f_op = fops_get(old_fops);
}
fops_put(old_fops);
+ unlock_kernel();
return err;
}
spin_unlock(&sound_loader_lock);
return err;
}
spin_unlock(&sound_loader_lock);
+ unlock_kernel();
return -ENODEV;
}
return -ENODEV;
}