[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/9] usb: rearrange usb_ep_get()
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 1/9] usb: rearrange usb_ep_get() |
Date: |
Wed, 20 Feb 2019 12:13:38 +0100 |
From: Liam Merwick <address@hidden>
There is no need to calculate the 'eps' variable in usb_ep_get()
if 'ep' is the control endpoint. Instead the calculation should
be done after validating the input before returning an entry
indexed by the endpoint 'ep'.
Signed-off-by: Liam Merwick <address@hidden>
Reviewed-by: Darren Kenny <address@hidden>
Reviewed-by: Mark Kanda <address@hidden>
Reviewed-by: Ameya More <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/usb/core.c b/hw/usb/core.c
index 241ae66b15..bfb7ae67bb 100644
--- a/hw/usb/core.c
+++ b/hw/usb/core.c
@@ -720,12 +720,12 @@ struct USBEndpoint *usb_ep_get(USBDevice *dev, int pid,
int ep)
if (dev == NULL) {
return NULL;
}
- eps = (pid == USB_TOKEN_IN) ? dev->ep_in : dev->ep_out;
if (ep == 0) {
return &dev->ep_ctl;
}
assert(pid == USB_TOKEN_IN || pid == USB_TOKEN_OUT);
assert(ep > 0 && ep <= USB_MAX_ENDPOINTS);
+ eps = (pid == USB_TOKEN_IN) ? dev->ep_in : dev->ep_out;
return eps + ep - 1;
}
--
2.9.3
- [Qemu-devel] [PULL 0/9] Usb 20190220 patches, Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 3/9] xhci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 7/9] usb: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 9/9] usb: remove unnecessary NULL device check from usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 1/9] usb: rearrange usb_ep_get(),
Gerd Hoffmann <=
- [Qemu-devel] [PULL 5/9] ohci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 2/9] xhci: add asserts to help with static code analysis, Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 6/9] uhci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 8/9] usb: add device checks before redirector calls to usb_ep_get(), Gerd Hoffmann, 2019/02/20
- [Qemu-devel] [PULL 4/9] ehci: check device is not NULL before calling usb_ep_get(), Gerd Hoffmann, 2019/02/20
- Re: [Qemu-devel] [PULL 0/9] Usb 20190220 patches, Peter Maydell, 2019/02/21