The patch titled
create device symlink in snd-aoa
has been added to the -mm tree. Its filename is
create-device-symlink-in-snd-aoa.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: create device symlink in snd-aoa
From: Olaf Hering <olaf@xxxxxxxxx>
create sysfs device symlinks for snd-aoa in /sys/class/sound/controlC0 This
allows hald to recognize the device as sound device. Furthermore it allows
the desktop user to actually access the sound device nodes. hald and
related packages will modify the acl attributes.
Fixes https://bugzilla.novell.com/show_bug.cgi?id=106294
Signed-off-by: Olaf Hering <olaf@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
sound/aoa/aoa.h | 2 +-
sound/aoa/core/snd-aoa-alsa.c | 3 ++-
sound/aoa/core/snd-aoa-alsa.h | 2 +-
sound/aoa/core/snd-aoa-core.c | 4 ++--
sound/aoa/fabrics/snd-aoa-fabric-layout.c | 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff -puN sound/aoa/aoa.h~create-device-symlink-in-snd-aoa sound/aoa/aoa.h
--- a/sound/aoa/aoa.h~create-device-symlink-in-snd-aoa
+++ a/sound/aoa/aoa.h
@@ -99,7 +99,7 @@ struct aoa_fabric {
* that are not assigned yet are passed to the fabric
* again for reconsideration. */
extern int
-aoa_fabric_register(struct aoa_fabric *fabric);
+aoa_fabric_register(struct aoa_fabric *fabric, struct device *dev);
/* it is vital to call this when the fabric exits!
* When calling, the remove_codec will be called
diff -puN sound/aoa/core/snd-aoa-alsa.c~create-device-symlink-in-snd-aoa sound/aoa/core/snd-aoa-alsa.c
--- a/sound/aoa/core/snd-aoa-alsa.c~create-device-symlink-in-snd-aoa
+++ a/sound/aoa/core/snd-aoa-alsa.c
@@ -14,7 +14,7 @@ MODULE_PARM_DESC(index, "index for AOA s
static struct aoa_card *aoa_card;
-int aoa_alsa_init(char *name, struct module *mod)
+int aoa_alsa_init(char *name, struct module *mod, struct device *dev)
{
struct snd_card *alsa_card;
int err;
@@ -28,6 +28,7 @@ int aoa_alsa_init(char *name, struct mod
return -ENOMEM;
aoa_card = alsa_card->private_data;
aoa_card->alsa_card = alsa_card;
+ alsa_card->dev = dev;
strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver));
strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname));
strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname));
diff -puN sound/aoa/core/snd-aoa-alsa.h~create-device-symlink-in-snd-aoa sound/aoa/core/snd-aoa-alsa.h
--- a/sound/aoa/core/snd-aoa-alsa.h~create-device-symlink-in-snd-aoa
+++ a/sound/aoa/core/snd-aoa-alsa.h
@@ -10,7 +10,7 @@
#define __SND_AOA_ALSA_H
#include "../aoa.h"
-extern int aoa_alsa_init(char *name, struct module *mod);
+extern int aoa_alsa_init(char *name, struct module *mod, struct device *dev);
extern void aoa_alsa_cleanup(void);
#endif /* __SND_AOA_ALSA_H */
diff -puN sound/aoa/core/snd-aoa-core.c~create-device-symlink-in-snd-aoa sound/aoa/core/snd-aoa-core.c
--- a/sound/aoa/core/snd-aoa-core.c~create-device-symlink-in-snd-aoa
+++ a/sound/aoa/core/snd-aoa-core.c
@@ -82,7 +82,7 @@ void aoa_codec_unregister(struct aoa_cod
}
EXPORT_SYMBOL_GPL(aoa_codec_unregister);
-int aoa_fabric_register(struct aoa_fabric *new_fabric)
+int aoa_fabric_register(struct aoa_fabric *new_fabric, struct device *dev)
{
struct aoa_codec *c;
int err;
@@ -98,7 +98,7 @@ int aoa_fabric_register(struct aoa_fabri
if (!new_fabric)
return -EINVAL;
- err = aoa_alsa_init(new_fabric->name, new_fabric->owner);
+ err = aoa_alsa_init(new_fabric->name, new_fabric->owner, dev);
if (err)
return err;
diff -puN sound/aoa/fabrics/snd-aoa-fabric-layout.c~create-device-symlink-in-snd-aoa sound/aoa/fabrics/snd-aoa-fabric-layout.c
--- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c~create-device-symlink-in-snd-aoa
+++ a/sound/aoa/fabrics/snd-aoa-fabric-layout.c
@@ -1014,7 +1014,7 @@ static int aoa_fabric_layout_probe(struc
ldev->gpio.methods->init(&ldev->gpio);
- err = aoa_fabric_register(&layout_fabric);
+ err = aoa_fabric_register(&layout_fabric, &sdev->ofdev.dev);
if (err && err != -EALREADY) {
printk(KERN_INFO "snd-aoa-fabric-layout: can't use,"
" another fabric is active!\n");
_
Patches currently in -mm which might be from olaf@xxxxxxxxx are
create-driver-symlink-in-snd-aoa.patch
create-device-symlink-in-snd-aoa.patch
git-ieee1394.patch
winbond-ide-depends-on-idedma.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
