summaryrefslogtreecommitdiffstats
path: root/src/modules/module-hal-detect.c
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2007-03-06 13:31:29 +0000
committerPierre Ossman <ossman@cendio.se>2007-03-06 13:31:29 +0000
commit0b14c026890ee6806971d179a66aee5b03e1d763 (patch)
tree99e0068d35bf4afa662f6779bf2d819c9c0640e7 /src/modules/module-hal-detect.c
parent2b82336df2eb8cf1c9ae150b1850540a88f68ecf (diff)
Don't fail if hal doesn't currently contain any devices. (closes #55)
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1434 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/modules/module-hal-detect.c')
-rw-r--r--src/modules/module-hal-detect.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c
index 56a3efc1..a28b6f0d 100644
--- a/src/modules/module-hal-detect.c
+++ b/src/modules/module-hal-detect.c
@@ -488,7 +488,6 @@ fail:
}
int pa__init(pa_core *c, pa_module*m) {
- int n;
DBusError error;
pa_dbus_connection *conn;
struct userdata *u = NULL;
@@ -519,16 +518,11 @@ int pa__init(pa_core *c, pa_module*m) {
m->userdata = (void*) u;
#ifdef HAVE_ALSA
- if ((n = hal_device_add_all(u, CAP_ALSA)) <= 0)
+ hal_device_add_all(u, CAP_ALSA);
#endif
#ifdef HAVE_OSS
- if ((n = hal_device_add_all(u, CAP_OSS)) <= 0)
+ hal_device_add_all(u, CAP_OSS);
#endif
- {
- pa_log_warn("failed to detect any sound hardware.");
- userdata_free(u);
- return -1;
- }
libhal_ctx_set_user_data(hal_ctx, (void*) u);
libhal_ctx_set_device_added(hal_ctx, device_added_cb);