diff options
author | Hans de Goede <hdegoede@redhat.com> | 2011-02-17 12:35:46 +0100 |
---|---|---|
committer | Hans de Goede <hdegoede@redhat.com> | 2011-06-17 10:59:26 +0200 |
commit | 40716b73b84b129814c3c8c91d41cbc9af9b190f (patch) | |
tree | bd398f339903f84e3265ca9fb6c4b886bd96b5d5 | |
parent | 5765476148dff10f3de7c8888e3eef59455a3255 (diff) |
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>
-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 ccfaa87..2a0d5b0 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); |