2014-08-11 13:27:10 +02:00

20 lines
836 B
Plaintext

$NetBSD: patch-dc,v 1.4 2013/11/25 10:13:56 wiz Exp $
If oss.originating_device hal properly isn't available, try
sound.originating_device.
--- src/modules/module-hal-detect.c.orig 2012-07-19 11:29:39.000000000 +0000
+++ src/modules/module-hal-detect.c
@@ -334,6 +334,11 @@ static int hal_device_load_oss(struct us
/* We store only one entry per card, hence we look for the originating device */
originating_udi = libhal_device_get_property_string(u->context, udi, "oss.originating_device", &error);
+ if (dbus_error_is_set(&error) || !originating_udi) {
+ if (dbus_error_is_set(&error))
+ dbus_error_free(&error);
+ originating_udi = libhal_device_get_property_string(u->context, udi, "sound.originating_device", &error);
+ }
if (dbus_error_is_set(&error) || !originating_udi)
goto fail;