From 65faf2142660f2956079d8c14a474d79118b1e1f Mon Sep 17 00:00:00 2001 From: Ludovic Rousseau Date: Mon, 21 Jun 2010 10:19:29 +0200 Subject: Only initialize the default context when it is requested --- libusb/core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libusb/core.c b/libusb/core.c index d0d3b4e..28f9ddb 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -1533,10 +1533,15 @@ API_EXPORTED int LIBUSB_API libusb_init(libusb_context **context) goto err; } + if (context) { + *context = ctx; + } else if (!usbi_default_context) { + usbi_dbg("created default context"); + usbi_default_context = ctx; + default_context_refcnt++; + } usbi_mutex_static_unlock(&default_context_lock); - if (context) - *context = ctx; return 0; err: -- cgit v1.2.1