diff options
| author | Pete Batard <pbatard@gmail.com> | 2010-04-20 15:26:47 +0100 |
|---|---|---|
| committer | Pete Batard <pbatard@gmail.com> | 2010-04-20 15:26:47 +0100 |
| commit | e3d7fc014b60300c91f737248bacdc2c6e8eda12 (patch) | |
| tree | 4a602e5bb8c97c39a248e8520655d8f113aa6c1c /libusb/os/linux_usbfs.c | |
| parent | 4ab789bb911d4b47556ef078c379d05e50efa703 (diff) | |
| download | libusb-e3d7fc014b60300c91f737248bacdc2c6e8eda12.tar.gz | |
merged official 1.0.6 -> 1.0.7 release changes
Diffstat (limited to 'libusb/os/linux_usbfs.c')
| -rw-r--r-- | libusb/os/linux_usbfs.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c index 53d2e94..b398577 100644 --- a/libusb/os/linux_usbfs.c +++ b/libusb/os/linux_usbfs.c @@ -381,7 +381,8 @@ static int sysfs_get_active_config(struct libusb_device *dev, int *config) /* takes a usbfs/descriptors fd seeked to the start of a configuration, and * seeks to the next one. */ -static int seek_to_next_config(struct libusb_context *ctx, int fd) +static int seek_to_next_config(struct libusb_context *ctx, int fd, + int host_endian) { struct libusb_config_descriptor config; unsigned char tmp[6]; @@ -399,7 +400,7 @@ static int seek_to_next_config(struct libusb_context *ctx, int fd) } /* seek forward to end of config */ - usbi_parse_descriptor(tmp, "bbwbb", &config, 0); + usbi_parse_descriptor(tmp, "bbwbb", &config, host_endian); off = lseek(fd, config.wTotalLength - sizeof(tmp), SEEK_CUR); if (off < 0) { usbi_err(ctx, "seek failed ret=%d errno=%d", off, errno); @@ -476,7 +477,7 @@ static int sysfs_get_active_config_descriptor(struct libusb_device *dev, if (off < 0) return LIBUSB_ERROR_IO; - r = seek_to_next_config(DEVICE_CTX(dev), fd); + r = seek_to_next_config(DEVICE_CTX(dev), fd, 1); if (r < 0) return r; } @@ -531,7 +532,7 @@ static int get_config_descriptor(struct libusb_context *ctx, int fd, /* might need to skip some configuration descriptors to reach the * requested configuration */ while (config_index > 0) { - r = seek_to_next_config(ctx, fd); + r = seek_to_next_config(ctx, fd, 0); if (r < 0) return r; config_index--; |