Received: by 2002:a05:6a10:c604:0:0:0:0 with SMTP id y4csp3777651pxt; Tue, 10 Aug 2021 11:05:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqzFmEdgqZjY/zVpNkkf6KBeymQa5pY9cSHPVmR+Pwmk11wcoPmZ9A4mBek02jtB2fKhZ/ X-Received: by 2002:a05:6638:268f:: with SMTP id o15mr15679962jat.22.1628618739506; Tue, 10 Aug 2021 11:05:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628618739; cv=none; d=google.com; s=arc-20160816; b=s4zKpr/v3wNfaUZuPvSR5BVXqrJ7ahrQuFETHEG5GJeYI6ScY63tI3MkESpZmnNNAM Zs0UvkPkpI4/HnWllzGZ8XuewmYhmVNqO0+bNTYRUyVg03/5HnAdk9DdcU8G5FQXOxs0 m6RedtFcHDHK2P+78xZSieWLUm42XLzD298lAZ+ZaWkiQqF8hhUJu29Ll+uKJW8xWsNP mZs9sIDlYiRwvwaidNXSYC/7E47N8A30lZFfKJwFzdmcft3+dhP3708IBc85hxWxWRFB W+GlfUGvNla4MES9xyuTZ+qW2Mhr6IbQwPH1E4vagQPLyQzYoszhFXxtTsTA/KVnnHMq 9/FA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1mBpTB/7Q9WUbZ+eiNprdTx+t+fGiLswA+EgkBSObaU=; b=zMknk7FUrJsy6d5j3ts4MUcuHzo2yfd01Op7sJ54JvuviS3W6CBZd2cFXk8a5eek/R Grp6y2hRZehYmZHKIZf6eeLqfDBTOgw9tyY0t8FzT+sfuLbsMvKsG9rSJ9zYBLrkCRKy oAyRlVsbmxwQkHcSLb154vANVLsoikJ1PAzwqxN2H3TLk3kg5/DL7cD3DJ2BQ+Z30Lh6 WVagsayxkTYrmOKmrwbPSpHa5L1NHLnIl9WePOZ3tyT218SUOz9AEbtBXpgzU3ON/d0b 8NpZXa/0fSLSeuaEMcCC1Ue9zW7BLSmqMOsfCkyNOTHAc6z9jdPJHMwD6yMVqkDzixdH OL5g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NrBHayE1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m16si12376579jat.17.2021.08.10.11.05.28; Tue, 10 Aug 2021 11:05:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NrBHayE1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237323AbhHJSCU (ORCPT + 99 others); Tue, 10 Aug 2021 14:02:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:51086 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236963AbhHJR4e (ORCPT ); Tue, 10 Aug 2021 13:56:34 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AE9996137D; Tue, 10 Aug 2021 17:45:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1628617501; bh=shCdDjnZtYtla1OUNgFX+5xVre4DZppOtg+ux1VdUAg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NrBHayE1ys4xtv28+QHJ1lGO/D702wH7pj7pV5Hnj1UkUx3yRT0y5HDDjJGdd4nG6 /ftufBNcyctCz6G9jcMdoiD2XUGglsKpNeeTcIlVxcQam4zcAVu7vWa00xy+cH2lww gVDLYy6cpSSn4rSyJTcIfAGNz0F3D0DWbWoXhkPw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Iwai Subject: [PATCH 5.13 086/175] ALSA: usb-audio: Fix superfluous autosuspend recovery Date: Tue, 10 Aug 2021 19:29:54 +0200 Message-Id: <20210810173003.775880641@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210810173000.928681411@linuxfoundation.org> References: <20210810173000.928681411@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Takashi Iwai commit 66291b6adb66dd3bc96b0f594d88c2ff1300d95f upstream. The change to restore the autosuspend from the disabled state uses a wrong check: namely, it should have been the exact comparison of the quirk_type instead of the bitwise and (&). Otherwise it matches wrongly with the other quirk types. Although re-enabling the autosuspend for the already enabled device shouldn't matter much, it's better to fix the unbalanced call. Fixes: 9799110825db ("ALSA: usb-audio: Disable USB autosuspend properly in setup_disable_autosuspend()") Cc: Link: https://lore.kernel.org/r/s5hr1flh9ov.wl-tiwai@suse.de Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/usb/card.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/sound/usb/card.c +++ b/sound/usb/card.c @@ -907,7 +907,7 @@ static void usb_audio_disconnect(struct } } - if (chip->quirk_type & QUIRK_SETUP_DISABLE_AUTOSUSPEND) + if (chip->quirk_type == QUIRK_SETUP_DISABLE_AUTOSUSPEND) usb_enable_autosuspend(interface_to_usbdev(intf)); chip->num_interfaces--;