From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=35717 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PM2l0-0005ql-EB for qemu-devel@nongnu.org; Fri, 26 Nov 2010 13:10:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PM2kz-0002CF-H2 for qemu-devel@nongnu.org; Fri, 26 Nov 2010 13:10:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PM2kz-0002C4-92 for qemu-devel@nongnu.org; Fri, 26 Nov 2010 13:10:49 -0500 From: Hans de Goede Date: Fri, 26 Nov 2010 19:13:22 +0100 Message-Id: <1290795203-2597-6-git-send-email-hdegoede@redhat.com> In-Reply-To: <1290795203-2597-1-git-send-email-hdegoede@redhat.com> References: <1290795203-2597-1-git-send-email-hdegoede@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] usb-linux: We only need to keep track of 15 endpoints List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: spice-devel@lists.freedesktop.org, Gerd Hoffmann , Hans de Goede Currently we reserve room for endpoint data for 16 endpoints, but given that we only use endpoint data for endpoints 1-15, and always index the array with the endpoint-number - 1, 15 is enough. Signed-off-by: Hans de Goede --- usb-linux.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/usb-linux.c b/usb-linux.c index 5a979bd..9301084 100644 --- a/usb-linux.c +++ b/usb-linux.c @@ -78,7 +78,7 @@ typedef int USBScanFunc(void *opaque, int bus_num, int addr, int devpath, #define USBPROCBUS_PATH "/proc/bus/usb" #define PRODUCT_NAME_SZ 32 -#define MAX_ENDPOINTS 16 +#define MAX_ENDPOINTS 15 #define USBDEVBUS_PATH "/dev/bus/usb" #define USBSYSBUS_PATH "/sys/bus/usb" @@ -724,7 +724,7 @@ static int usb_host_set_interface(USBHostDevice *s, int iface, int alt) struct usbdevfs_setinterface si; int i, ret; - for (i = 1; i < MAX_ENDPOINTS; i++) { + for (i = 1; i <= MAX_ENDPOINTS; i++) { if (is_isoc(s, i)) { usb_host_stop_n_free_iso(s, i); } @@ -1275,7 +1275,7 @@ static int usb_host_close(USBHostDevice *dev) qemu_set_fd_handler(dev->fd, NULL, NULL, NULL); dev->closing = 1; - for (i = 1; i < MAX_ENDPOINTS; i++) { + for (i = 1; i <= MAX_ENDPOINTS; i++) { if (is_isoc(dev, i)) { usb_host_stop_n_free_iso(dev, i); } -- 1.7.3.2