From 3c90600cbb564cc60edc4d03ff538da924a820ae Mon Sep 17 00:00:00 2001 From: "levitte@gmail.com" Date: Fri, 18 Sep 2009 12:03:56 +0000 Subject: [PATCH] Make sure to handle cases when the backend is stopped before being initialised git-svn-id: https://yubikey-personalization.googlecode.com/svn/trunk@209 b62f149e-849f-11dd-9899-c7ba65f7c4c7 --- ykcore/ykcore_libusb-1.0.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ykcore/ykcore_libusb-1.0.c b/ykcore/ykcore_libusb-1.0.c index 7fc9aee..35f7bb0 100644 --- a/ykcore/ykcore_libusb-1.0.c +++ b/ykcore/ykcore_libusb-1.0.c @@ -41,6 +41,7 @@ #define HID_SET_REPORT 0x09 static int ykl_errno; +static int libusb_inited = 0; /************************************************************************* ** function _ykusb_write ** @@ -135,13 +136,18 @@ int _ykusb_read(void *dev, int report_type, int report_number, int _ykusb_start(void) { libusb_init(NULL); + libusb_inited = 1; return 1; } extern int _ykusb_stop(void) { - libusb_exit(NULL); - return 1; + if (libusb_inited == 1) { + libusb_exit(NULL); + return 1; + } + yk_errno = YK_EUSBERR; + return 0; } void *_ykusb_open_device(int vendor_id, int product_id) -- 2.39.5