ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(libusb) Cleanups

This commit is contained in:
twinaphex 2015-04-03 19:02:35 +02:00
parent b0d740ea09
commit b3be54721e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
input/drivers_hid/libusb_hid.c
View File

@ -132,15 +132,16 @@ static int add_adapter(void *data, struct libusb_device *dev)
int rc;
struct libusb_device_descriptor desc;
struct libusb_adapter *old_head = NULL;
struct libusb_adapter *adapter = (struct libusb_adapter*)calloc(1, sizeof(struct libusb_adapter));
struct libusb_hid *hid = (struct libusb_hid*)data;
const char *device_name = NULL;
struct libusb_adapter *adapter = (struct libusb_adapter*)calloc(1, sizeof(struct libusb_adapter));
if (!adapter)
if (!adapter || !hid)
{
fprintf(stderr, "Allocation of adapter failed.\n");
return -1;
}
rc = libusb_get_device_descriptor(dev, &desc);
if (rc != LIBUSB_SUCCESS)
@ -150,6 +151,7 @@ static int add_adapter(void *data, struct libusb_device *dev)
}
adapter->device = dev;
adapter->slot = MAX_USERS;
rc = libusb_open (adapter->device, &adapter->handle);
@ -184,7 +186,7 @@ static int add_adapter(void *data, struct libusb_device *dev)
goto error;
}
device_name = (const char*)adapter->name;
device_name = (const char*)adapter->name;
adapter->slot = pad_connection_pad_init(hid->slots,
device_name, adapter, &libusb_hid_device_send_control);
@ -194,7 +196,6 @@ static int add_adapter(void *data, struct libusb_device *dev)
if (!pad_connection_has_interface(hid->slots, adapter->slot))
goto error;
if (adapter->name[0] == '\0')
goto error;