build: add helper/types.h to config.h

[openocd] / src / jtag / drivers / libusb1_common.c

diff --git a/src/jtag/drivers/libusb1_common.c b/src/jtag/drivers/libusb1_common.c
index c6cb494335a88fbc29b5b0d4596e4282628d7741..194f737cde3a9f87955b2ec594d85765e3c6051c 100644 (file)
--- a/src/jtag/drivers/libusb1_common.c
+++ b/src/jtag/drivers/libusb1_common.c
@@ -74,13 +74,13 @@ int jtag_libusb_open(const uint16_t vids[], const uint16_t pids[],
 void jtag_libusb_close(jtag_libusb_device_handle *dev)
 {
        /* Close device */
-       jtag_libusb_close(dev);
+       libusb_close(dev);
 
        libusb_exit(jtag_libusb_context);
 }
 
 int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
-                          int size, int timeout)
+               int size, int timeout)
 {
        int transferred = 0;
 
@@ -90,7 +90,7 @@ int jtag_libusb_bulk_write(jtag_libusb_device_handle *dev, int ep, char *bytes,
 }
 
 int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
-                         int size, int timeout)
+               int size, int timeout)
 {
        int transferred = 0;
 
@@ -100,12 +100,12 @@ int jtag_libusb_bulk_read(jtag_libusb_device_handle *dev, int ep, char *bytes,
 }
 
 int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
-                                 int configuration)
+               int configuration)
 {
        struct jtag_libusb_device *udev = jtag_libusb_get_device(devh);
        int retCode = -99;
 
-       struct libusb_config_descriptor *config;
+       struct libusb_config_descriptor *config = NULL;
 
        libusb_get_config_descriptor(udev, configuration, &config);
        retCode = libusb_set_configuration(devh, config->bConfigurationValue);
@@ -116,8 +116,8 @@ int jtag_libusb_set_configuration(jtag_libusb_device_handle *devh,
 }
 
 int jtag_libusb_get_endpoints(struct jtag_libusb_device *udev,
-                             unsigned int *usb_read_ep,
-                             unsigned int *usb_write_ep)
+               unsigned int *usb_read_ep,
+               unsigned int *usb_write_ep)
 {
        const struct libusb_interface *inter;
        const struct libusb_interface_descriptor *interdesc;