From d06680afe88d14a46ce8a4541d43d514a225732f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Aug 2009 22:06:23 +0200
Subject: udev: always verify access before loading modules

---
 src/modules/module-udev-detect.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'src/modules/module-udev-detect.c')

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);
 
-- 
cgit