Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965874AbcJFIvR (ORCPT ); Thu, 6 Oct 2016 04:51:17 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48695 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964918AbcJFIvO (ORCPT ); Thu, 6 Oct 2016 04:51:14 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Cristian Birsan , Joshua Henderson , Ladislav Michl , Felipe Balbi , Tony Lindgren , Adam Ford Subject: [PATCH 4.4 12/93] usb: musb: fix DMA for host mode Date: Thu, 6 Oct 2016 10:28:42 +0200 Message-Id: <20161006074731.652182944@linuxfoundation.org> X-Mailer: git-send-email 2.10.0 In-Reply-To: <20161006074731.150212126@linuxfoundation.org> References: <20161006074731.150212126@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1632 Lines: 46 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Cristian Birsan commit 4c2ba0c67394514f3f75c660c9f5d02e66a7efd4 upstream. Commit ac33cdb16681 ("usb: musb: Remove ifdefs for musb_host_rx in musb_host.c part5") introduces a problem setting DMA host mode. The musb_advance_schedule() is called immediately after receiving an endpoint RX interrupt without waiting for the DMA transfer to complete. As a consequence when the dma complete interrupt arrives the in_qh member of hw_ep is already null an the musb_host_rx() exits on !urb error case. Fix the done condition that advances the musb schedule. Signed-off-by: Cristian Birsan Signed-off-by: Joshua Henderson Tested-by: Ladislav Michl Signed-off-by: Felipe Balbi Cc: Tony Lindgren Cc: Adam Ford Signed-off-by: Greg Kroah-Hartman --- drivers/usb/musb/musb_host.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -2008,10 +2008,8 @@ void musb_host_rx(struct musb *musb, u8 qh->offset, urb->transfer_buffer_length); - done = musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, - urb, xfer_len, - iso_err); - if (done) + if (musb_rx_dma_in_inventra_cppi41(c, hw_ep, qh, urb, + xfer_len, iso_err)) goto finish; else dev_err(musb->controller, "error: rx_dma failed\n");