From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNKuc-0007ro-Gt for qemu-devel@nongnu.org; Fri, 29 Aug 2014 08:04:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNKuT-0003Y6-Ga for qemu-devel@nongnu.org; Fri, 29 Aug 2014 08:04:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41315) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNKuT-0003Xf-9Y for qemu-devel@nongnu.org; Fri, 29 Aug 2014 08:04:05 -0400 From: Gerd Hoffmann Date: Fri, 29 Aug 2014 14:03:38 +0200 Message-Id: <1409313832-2514-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1409313832-2514-1-git-send-email-kraxel@redhat.com> References: <1409313832-2514-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 03/17] Fix OHCI ISO TD state never being written back. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann , Jack Un From: Jack Un There appears to be typo in OHCI with isochronous transfers resulting in isoch. transfer descriptor state never being written back. The'put_words' function is in a OR statement hence it is never called. Signed-off-by: Jack Un Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-ohci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c index 13afdf5..cacf7b0 100644 --- a/hw/usb/hcd-ohci.c +++ b/hw/usb/hcd-ohci.c @@ -619,8 +619,8 @@ static inline int ohci_put_td(OHCIState *ohci, static inline int ohci_put_iso_td(OHCIState *ohci, dma_addr_t addr, struct ohci_iso_td *td) { - return put_dwords(ohci, addr, (uint32_t *)td, 4 || - put_words(ohci, addr + 16, td->offset, 8)); + return put_dwords(ohci, addr, (uint32_t *)td, 4) || + put_words(ohci, addr + 16, td->offset, 8); } static inline int ohci_put_hcca(OHCIState *ohci, -- 1.8.3.1