git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'topic/fix/asoc', 'topic/fix/hda', 'topic/fix/misc' and 'topic/pci...
[sfrench/cifs-2.6.git]
/
sound
/
sound_core.c
diff --git
a/sound/sound_core.c
b/sound/sound_core.c
index 4ae07e236b36a81d87a51307a9272b50cef17528..a75b289a5d78465c25ccf2aab83958e3e8a0a67d 100644
(file)
--- a/
sound/sound_core.c
+++ b/
sound/sound_core.c
@@
-57,7
+57,7
@@
module_exit(cleanup_soundcore);
/*
* OSS sound core handling. Breaks out sound functions to submodules
*
/*
* OSS sound core handling. Breaks out sound functions to submodules
*
- * Author: Alan Cox <alan
.cox@linux.org
>
+ * Author: Alan Cox <alan
@lxorguk.ukuu.org.uk
>
*
* Fixes:
*
*
* Fixes:
*
@@
-220,9
+220,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);
- device_create_drvdata(sound_class, dev,
- MKDEV(SOUND_MAJOR, s->unit_minor),
- NULL, s->name+6);
+ device_create(sound_class, dev, MKDEV(SOUND_MAJOR, s->unit_minor),
+ NULL, s->name+6);
return r;
fail:
return r;
fail: