From c3b0d841d19898cd268a65173b6c0ca5f88a64c7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 12 Feb 2009 04:15:15 +0100 Subject: make module-hal-detect pick up all cards even when they have no device 0 --- src/modules/module-hal-detect.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src') diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index 8b1f0b2d..e6037381 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -180,7 +180,7 @@ finish: static int hal_device_load_alsa(struct userdata *u, const char *udi, struct device *d) { enum alsa_type type; - int device, card; + int card; DBusError error; pa_module *m; char *args, *originating_udi = NULL, *card_name = NULL; @@ -200,11 +200,6 @@ static int hal_device_load_alsa(struct userdata *u, const char *udi, struct devi if (hal_alsa_device_is_modem(u->context, udi)) goto fail; - /* We only care for the main device */ - device = libhal_device_get_property_int(u->context, udi, "alsa.device", &error); - if (dbus_error_is_set(&error) || device != 0) - goto fail; - /* We store only one entry per card, hence we look for the originating device */ originating_udi = libhal_device_get_property_string(u->context, udi, "alsa.originating_device", &error); if (dbus_error_is_set(&error) || !originating_udi) -- cgit