aboutsummaryrefslogtreecommitdiff
path: root/src/survive_usb.c
diff options
context:
space:
mode:
authorcnlohr <lohr85@gmail.com>2017-02-16 14:44:54 -0500
committercnlohr <lohr85@gmail.com>2017-02-16 14:44:54 -0500
commitf2d014016d73f067c224ee222bc3eab910848914 (patch)
treee98df6e5d4e85f8bd35c184b0136968c7e07af90 /src/survive_usb.c
parentf782146df94b3b54965c2aed696d49e86870046d (diff)
parent05ff11b162145e327ba5839f77be09df5289f4d1 (diff)
downloadlibsurvive-f2d014016d73f067c224ee222bc3eab910848914.tar.gz
libsurvive-f2d014016d73f067c224ee222bc3eab910848914.tar.bz2
Merge branch 'axlecrusher-master'
Diffstat (limited to 'src/survive_usb.c')
-rw-r--r--src/survive_usb.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/survive_usb.c b/src/survive_usb.c
index cf12280..aec76db 100644
--- a/src/survive_usb.c
+++ b/src/survive_usb.c
@@ -125,7 +125,8 @@ static inline int getupdate_feature_report(libusb_device_handle* dev, uint16_t i
static inline int hid_get_feature_report_timeout(libusb_device_handle* device, uint16_t interface, unsigned char *buf, size_t len )
{
int ret;
- for (unsigned i = 0; i < 100; i++)
+ uint8_t i = 0;
+ for (i = 0; i < 100; i++)
{
ret = getupdate_feature_report(device, interface, buf, len);
if( ret != -9 && ( ret != -1 || errno != EPIPE ) ) return ret;
@@ -146,6 +147,7 @@ int survive_usb_init( struct SurviveContext * ctx )
}
int i;
+ int16_t j;
libusb_device** devs;
int ret = libusb_get_device_list(ctx->usbctx, &devs);
@@ -201,7 +203,7 @@ int survive_usb_init( struct SurviveContext * ctx )
}
libusb_set_auto_detach_kernel_driver( ctx->udev[i], 1 );
- for (int j = 0; j < conf->bNumInterfaces; j++ )
+ for (j = 0; j < conf->bNumInterfaces; j++ )
{
#if 0
if (libusb_kernel_driver_active(ctx->udev[i], j) == 1) {