diff options
| author |  Martin Szulecki | 2014-10-02 00:48:43 +0200 |
|---|---|---|
| committer | Martin Szulecki | 2014-10-02 00:48:43 +0200 |
| commit | cdc67e5a997d08158bcb24d51ca991838106bc7e (patch) | |
| tree | 147ca386e1c36cf0d2c1161d5475755903c5ed6a | |
| parent | ec1e5190b4a2f9b56500fee0bcd747cedac1426b (diff) | |
| download | libirecovery-cdc67e5a997d08158bcb24d51ca991838106bc7e.tar.gz libirecovery-cdc67e5a997d08158bcb24d51ca991838106bc7e.tar.bz2 | |
Don't call libusb_exit() in irecv_open_with_ecid() on error
The helper might be used multiple times and the library should not
cause deinitialization of libusb before the user calls irecv_exit().
| -rw-r--r-- | src/libirecovery.c | 2 | ||||
| -rw-r--r-- | tools/irecovery.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/libirecovery.c b/src/libirecovery.c index 83ceefd..99143cb 100644 --- a/src/libirecovery.c +++ b/src/libirecovery.c @@ -767,7 +767,6 @@ irecv_error_t irecv_open_with_ecid(irecv_client_t* pclient, unsigned long long e continue; } libusb_free_device_list(usb_device_list, 1); - libusb_exit(libirecovery_context); return IRECV_E_UNABLE_TO_CONNECT; } @@ -775,7 +774,6 @@ irecv_error_t irecv_open_with_ecid(irecv_client_t* pclient, unsigned long long e if (client == NULL) { libusb_free_device_list(usb_device_list, 1); libusb_close(usb_handle); - libusb_exit(libirecovery_context); return IRECV_E_OUT_OF_MEMORY; } diff --git a/tools/irecovery.c b/tools/irecovery.c index 9c153d8..1b1386a 100644 --- a/tools/irecovery.c +++ b/tools/irecovery.c @@ -518,6 +518,7 @@ int main(int argc, char* argv[]) { } irecv_close(client); + irecv_exit(); return 0; } |