summaryrefslogtreecommitdiffstats
path: root/src/modules/module-udev-detect.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2009-08-21 22:06:23 +0200
committerLennart Poettering <lennart@poettering.net>2009-08-21 22:06:23 +0200
commitd06680afe88d14a46ce8a4541d43d514a225732f (patch)
tree5a1405ba1d97458853a0412317d38d761512916d /src/modules/module-udev-detect.c
parent14c27c7ade403683e06705e45b9a3df28102a909 (diff)
udev: always verify access before loading modules
Diffstat (limited to 'src/modules/module-udev-detect.c')
-rw-r--r--src/modules/module-udev-detect.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
index 22ce8c3c..2c7e7dc3 100644
--- a/src/modules/module-udev-detect.c
+++ b/src/modules/module-udev-detect.c
@@ -142,7 +142,6 @@ static void card_changed(struct userdata *u, struct udev_device *dev) {
struct device *d;
const char *path;
const char *t;
- pa_module *m;
char *n;
pa_assert(u);
@@ -183,16 +182,9 @@ static void card_changed(struct userdata *u, struct udev_device *dev) {
pa_yes_no(u->ignore_dB));
pa_xfree(n);
- pa_log_debug("Loading module-alsa-card with arguments '%s'", d->args);
- m = pa_module_load(u->core, "module-alsa-card", d->args);
-
- if (m) {
- d->module = m->index;
- pa_log_info("Card %s (%s) added and module loaded.", path, d->card_name);
- } else
- pa_log_info("Card %s (%s) added but failed to load module.", path, d->card_name);
-
pa_hashmap_put(u->devices, d->path, d);
+
+ verify_access(u, d);
}
static void remove_card(struct userdata *u, struct udev_device *dev) {
@@ -472,7 +464,7 @@ int pa__init(pa_module *m) {
udev_enumerate_unref(enumerate);
- pa_log_info("Loaded %u modules.", pa_hashmap_size(u->devices));
+ pa_log_info("Found %u cards.", pa_hashmap_size(u->devices));
pa_modargs_free(ma);