From: Tong Zhang <ztong0001@gmail.com>
To: Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Tong Zhang <ztong0001@gmail.com>,
Jasmin Fazlic <superfassl@gmail.com>,
Leon Romanovsky <leon@kernel.org>,
Romain Perier <romain.perier@gmail.com>,
Allen Pais <allen.lkml@gmail.com>,
Mark Brown <broonie@kernel.org>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Naoki Hayama <naoki.hayama@lineo.co.jp>,
Tom Rix <trix@redhat.com>,
alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org,
Joe Perches <joe@perches.com>
Cc: Takashi Iwai <tiwai@suse.de>
Subject: [PATCH v3 3/3] ALSA: rme9652: don't disable if not enabled
Date: Sun, 21 Mar 2021 11:38:40 -0400 [thread overview]
Message-ID: <20210321153840.378226-4-ztong0001@gmail.com> (raw)
In-Reply-To: <s5htup4exbl.wl-tiwai@suse.de>
rme9652 wants to disable a not enabled pci device, which makes kernel
throw a warning. Make sure the device is enabled before calling disable.
[ 1.751595] snd_rme9652 0000:00:03.0: disabling already-disabled device
[ 1.751605] WARNING: CPU: 0 PID: 174 at drivers/pci/pci.c:2146 pci_disable_device+0x91/0xb0
[ 1.759968] Call Trace:
[ 1.760145] snd_rme9652_card_free+0x76/0xa0 [snd_rme9652]
[ 1.760434] release_card_device+0x4b/0x80 [snd]
[ 1.760679] device_release+0x3b/0xa0
[ 1.760874] kobject_put+0x94/0x1b0
[ 1.761059] put_device+0x13/0x20
[ 1.761235] snd_card_free+0x61/0x90 [snd]
[ 1.761454] snd_rme9652_probe+0x3be/0x700 [snd_rme9652]
Suggested-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
---
sound/pci/rme9652/rme9652.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/pci/rme9652/rme9652.c b/sound/pci/rme9652/rme9652.c
index 4df992e846f2..f407a95fc81f 100644
--- a/sound/pci/rme9652/rme9652.c
+++ b/sound/pci/rme9652/rme9652.c
@@ -1731,7 +1731,8 @@ static int snd_rme9652_free(struct snd_rme9652 *rme9652)
if (rme9652->port)
pci_release_regions(rme9652->pci);
- pci_disable_device(rme9652->pci);
+ if (pci_is_enabled(rme9652->pci))
+ pci_disable_device(rme9652->pci);
return 0;
}
--
2.25.1
next prev parent reply other threads:[~2021-03-21 15:39 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-20 22:23 [PATCH v2 0/3] ALSA: hdsp and hdspm, don't disable device if not enabled Tong Zhang
2021-03-20 22:23 ` [PATCH v2 1/3] ALSA: hdsp: don't disable " Tong Zhang
2021-03-20 22:23 ` [PATCH v2 2/3] ALSA: hdspm: " Tong Zhang
2021-03-20 22:23 ` [PATCH v2 3/3] ALSA: rme9652: " Tong Zhang
2021-03-21 8:16 ` [PATCH v2 0/3] ALSA: hdsp and hdspm, don't disable device " Takashi Iwai
2021-03-21 15:38 ` [PATCH v3 0/3] ALSA: rme9652 " Tong Zhang
2021-03-22 11:21 ` Takashi Iwai
2021-03-21 15:38 ` [PATCH v3 1/3] ALSA: hdsp: don't disable " Tong Zhang
2021-03-21 15:38 ` [PATCH v3 2/3] ALSA: hdspm: " Tong Zhang
2021-03-21 15:38 ` Tong Zhang [this message]
2021-03-21 15:40 ` [PATCH v2 0/3] ALSA: hdsp and hdspm, don't disable device " Tong Zhang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210321153840.378226-4-ztong0001@gmail.com \
--to=ztong0001@gmail.com \
--cc=allen.lkml@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=gustavoars@kernel.org \
--cc=joe@perches.com \
--cc=leon@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=naoki.hayama@lineo.co.jp \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=romain.perier@gmail.com \
--cc=superfassl@gmail.com \
--cc=tiwai@suse.com \
--cc=tiwai@suse.de \
--cc=trix@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).