Sojus07/hackrf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate call to set configuration

Browse Source 
+ tidy calls to libusb_close()
This commit is contained in:
Dominic Spill
2015-06-29 13:08:41 +01:00
parent 1acd6a6ad6
commit f3a9e66924
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
host/libhackrf/src/hackrf.c
View File

@ -277,7 +277,6 @@ static int set_hackrf_configuration(libusb_device_handle* usb_device, int config
result = libusb_get_configuration(usb_device, &curr_config); result = libusb_get_configuration(usb_device, &curr_config);
if( result != 0 ) if( result != 0 )
{ {
libusb_close(usb_device);
return HACKRF_ERROR_LIBUSB; return HACKRF_ERROR_LIBUSB;
} }
@ -286,13 +285,11 @@ static int set_hackrf_configuration(libusb_device_handle* usb_device, int config
result = detach_kernel_drivers(usb_device); result = detach_kernel_drivers(usb_device);
if( result != 0 ) if( result != 0 )
{ {
libusb_close(usb_device);
return result; return result;
} }
result = libusb_set_configuration(usb_device, config); result = libusb_set_configuration(usb_device, config);
if( result != 0 ) if( result != 0 )
{ {
libusb_close(usb_device);
return HACKRF_ERROR_LIBUSB; return HACKRF_ERROR_LIBUSB;
} }
} }
@ -300,7 +297,6 @@ static int set_hackrf_configuration(libusb_device_handle* usb_device, int config
result = detach_kernel_drivers(usb_device); result = detach_kernel_drivers(usb_device);
if( result != 0 ) if( result != 0 )
{ {
libusb_close(usb_device);
return result; return result;
} }
return LIBUSB_SUCCESS; return LIBUSB_SUCCESS;
@ -487,6 +483,7 @@ static int hackrf_open_setup(libusb_device_handle* usb_device, hackrf_device** d
result = set_hackrf_configuration(usb_device, USB_CONFIG_STANDARD); result = set_hackrf_configuration(usb_device, USB_CONFIG_STANDARD);
if( result != LIBUSB_SUCCESS ) if( result != LIBUSB_SUCCESS )
{ {
libusb_close(usb_device);
return result; return result;
} }
@ -919,8 +916,6 @@ int ADDCALL hackrf_cpld_write(hackrf_device* device,
{ {
return result; return result;
} }
result = libusb_set_configuration(device->usb_device, 2);
result = libusb_claim_interface(device->usb_device, 0); result = libusb_claim_interface(device->usb_device, 0);
if (result != LIBUSB_SUCCESS) { if (result != LIBUSB_SUCCESS) {