From patchwork Thu Jul 12 16:06:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Salisbury X-Patchwork-Id: 170714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id CD9672C02E9 for ; Fri, 13 Jul 2012 02:06:24 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SpLu9-0003Ku-Fc; Thu, 12 Jul 2012 16:06:13 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SpLu4-0003Jl-IB for kernel-team@lists.ubuntu.com; Thu, 12 Jul 2012 16:06:08 +0000 Received: from 66-189-92-216.dhcp.oxfr.ma.charter.com ([66.189.92.216] helo=salisbury) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1SpLu4-0001m0-Dt for kernel-team@lists.ubuntu.com; Thu, 12 Jul 2012 16:06:08 +0000 Received: by salisbury (Postfix, from userid 1000) id 8B19AA0303; Thu, 12 Jul 2012 12:06:05 -0400 (EDT) From: joseph.salisbury@canonical.com To: kernel-team@lists.ubuntu.com Subject: [Quantal][PATCH 1/2](pre-mainline) ALSA: snd-usb: tighten EP_FLAG_RUNNING checks Date: Thu, 12 Jul 2012 12:06:04 -0400 Message-Id: <24de2729b756edcd4c218e85c941b226bfb2a930.1342107047.git.joseph.salisbury@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: In-Reply-To: References: X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com From: Joseph Salisbury BugLink: http://bugs.launchpad.net/bugs/1018020 In endpoint.c, bail out earlier in case the stream is stopped. Also clear the flag from deactivate_urbs() in case the chip's shutdown flag is set. Signed-off-by: Daniel Mack Signed-off-by: Joseph Salisbury --- sound/usb/endpoint.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index e690690..a75bdf4 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c @@ -350,7 +350,8 @@ static void snd_complete_urb(struct urb *urb) urb->status == -ENODEV || /* device removed */ urb->status == -ECONNRESET || /* unlinked */ urb->status == -ESHUTDOWN || /* device disabled */ - ep->chip->shutdown)) /* device disconnected */ + ep->chip->shutdown) || /* device disconnected */ + !test_bit(EP_FLAG_RUNNING, &ep->flags)) goto exit_clear; if (usb_pipeout(ep->pipe)) { @@ -522,13 +523,13 @@ static int deactivate_urbs(struct snd_usb_endpoint *ep, int force, int can_sleep unsigned int i; int async; + clear_bit(EP_FLAG_RUNNING, &ep->flags); + if (!force && ep->chip->shutdown) /* to be sure... */ return -EBADFD; async = !can_sleep && ep->chip->async_unlink; - clear_bit(EP_FLAG_RUNNING, &ep->flags); - INIT_LIST_HEAD(&ep->ready_playback_urbs); ep->next_packet_read_pos = 0; ep->next_packet_write_pos = 0;