michael@6: Index: src/modules/module-hal-detect.c michael@6: --- src/modules/module-hal-detect.c.orig 2009-01-13 00:10:34.000000000 +0100 michael@6: +++ src/modules/module-hal-detect.c 2009-02-21 11:44:42.227221959 +0100 michael@6: @@ -183,7 +183,7 @@ michael@6: goto fail; michael@6: michael@6: device = libhal_device_get_property_int(u->context, udi, "alsa.device", &error); michael@6: - if (dbus_error_is_set(&error) || device != 0) michael@6: + if (dbus_error_is_set(&error)) michael@6: goto fail; michael@6: michael@6: card = libhal_device_get_property_int(u->context, udi, "alsa.card", &error); michael@6: @@ -197,12 +197,12 @@ michael@6: *sink_name = pa_sprintf_malloc("alsa_output.%s", strip_udi(udi)); michael@6: michael@6: module_name = "module-alsa-sink"; michael@6: - args = pa_sprintf_malloc("device_id=%u sink_name=%s tsched=%i", card, *sink_name, (int) u->use_tsched); michael@6: + args = pa_sprintf_malloc("device_id=%u,%u sink_name=%s tsched=%i", card, device, *sink_name, (int) u->use_tsched); michael@6: } else { michael@6: *source_name = pa_sprintf_malloc("alsa_input.%s", strip_udi(udi)); michael@6: michael@6: module_name = "module-alsa-source"; michael@6: - args = pa_sprintf_malloc("device_id=%u source_name=%s tsched=%i", card, *source_name, (int) u->use_tsched); michael@6: + args = pa_sprintf_malloc("device_id=%u,%u source_name=%s tsched=%i", card, device, *source_name, (int) u->use_tsched); michael@6: } michael@6: michael@6: pa_log_debug("Loading %s with arguments '%s'", module_name, args);