From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A52DFC433E0 for ; Tue, 29 Dec 2020 08:26:46 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5B83A21D94 for ; Tue, 29 Dec 2020 08:26:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5B83A21D94 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 8EAD216ED; Tue, 29 Dec 2020 09:25:53 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8EAD216ED DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1609230403; bh=9Obkq8EpRqXA2gUKXuoqlU9n5DuTAuRNpubZ96cXXQc=; h=Date:From:To:Subject:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=sdTBC8klFv1XlKAL3c3LpgPA3Ak0p48LHG5hR/JiA9WYfsXHoyozLYgx9EVR2yZO0 hHbZMGvO+WYRuzURsYG0kNOXaxM09wG9gH2c+G3MAUozynqI9QR9dfiD/6lRlRaBDt A4Zl2rPD4k7aqJbbJ6QxZk5bv0xQpzEiemmxutfE= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 2C170F8020C; Tue, 29 Dec 2020 09:25:53 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7FD24F8022B; Tue, 29 Dec 2020 09:25:51 +0100 (CET) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 1E856F80143 for ; Tue, 29 Dec 2020 09:25:49 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 1E856F80143 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id C9768AFF0; Tue, 29 Dec 2020 08:25:48 +0000 (UTC) Date: Tue, 29 Dec 2020 09:25:48 +0100 Message-ID: From: Takashi Iwai To: Defang Bo Subject: Re: [PATCH] ALSA:usb-audio:check urb before kill it In-Reply-To: <1609074299-3990670-1-git-send-email-bodefang@126.com> References: <1609074299-3990670-1-git-send-email-bodefang@126.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Cc: alsa-devel@alsa-project.org, tiwai@suse.com, linux-kernel@vger.kernel.org, tom.ty89@gmail.com, kai.heng.feng@canonical.com X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On Sun, 27 Dec 2020 14:04:59 +0100, Defang Bo wrote: > > Similar to commit<124751d5e>, there should be a check for urb before kill it. > > Signed-off-by: Defang Bo usb_kill_urb() accepts the NULL urb pointer, so the NULL check in the caller side is basically superfluous. thanks, Takashi > --- > sound/usb/mixer.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c > index 81e987e..0223ef3 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -3589,8 +3589,10 @@ void snd_usb_mixer_disconnect(struct usb_mixer_interface *mixer) > /* stop any bus activity of a mixer */ > static void snd_usb_mixer_inactivate(struct usb_mixer_interface *mixer) > { > - usb_kill_urb(mixer->urb); > - usb_kill_urb(mixer->rc_urb); > + if (mixer->urb) > + usb_kill_urb(mixer->urb); > + if (mixer->rc_urb) > + usb_kill_urb(mixer->rc_urb); > } > > static int snd_usb_mixer_activate(struct usb_mixer_interface *mixer) > -- > 2.7.4 >