diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2011-02-17 12:35:46 +0100 |
|---|---|---|
| committer | Peter Stuge <peter@stuge.se> | 2011-07-24 23:34:58 +0200 |
| commit | 4e294dc9848aab86b31d2fff228cf97e7eadf913 (patch) | |
| tree | 4e38ed507aeb376238f120c945fe887bbca914a5 /libusb/core.c | |
| parent | a68f956dd4c29d6ed799f04f07a3346317843999 (diff) | |
| download | libusbx-4e294dc9848aab86b31d2fff228cf97e7eadf913.tar.gz | |
Core: Use USB_MAXINTERFACES rather then sizeof(claimed_interfaces)
claimed_interfaces is a long and thus its size differs on 32
versus 64 bits, this patch uses USB_MAXINTERFACES instead of
sizeof(claimed_interfaces) on interface number range checks
for consistent behavior independent of the arch.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Diffstat (limited to 'libusb/core.c')
| -rw-r--r-- | libusb/core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libusb/core.c b/libusb/core.c index afe9e6e..1dedb17 100644 --- a/libusb/core.c +++ b/libusb/core.c @@ -1270,7 +1270,7 @@ int API_EXPORTED libusb_claim_interface(libusb_device_handle *dev, int r = 0; usbi_dbg("interface %d", interface_number); - if (interface_number >= sizeof(dev->claimed_interfaces) * 8) + if (interface_number >= USB_MAXINTERFACES) return LIBUSB_ERROR_INVALID_PARAM; usbi_mutex_lock(&dev->lock); @@ -1307,7 +1307,7 @@ int API_EXPORTED libusb_release_interface(libusb_device_handle *dev, int r; usbi_dbg("interface %d", interface_number); - if (interface_number >= sizeof(dev->claimed_interfaces) * 8) + if (interface_number >= USB_MAXINTERFACES) return LIBUSB_ERROR_INVALID_PARAM; usbi_mutex_lock(&dev->lock); @@ -1351,7 +1351,7 @@ int API_EXPORTED libusb_set_interface_alt_setting(libusb_device_handle *dev, { usbi_dbg("interface %d altsetting %d", interface_number, alternate_setting); - if (interface_number >= sizeof(dev->claimed_interfaces) * 8) + if (interface_number >= USB_MAXINTERFACES) return LIBUSB_ERROR_INVALID_PARAM; usbi_mutex_lock(&dev->lock); |