diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-04-12 13:26:36 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-04-12 18:58:44 +0300 |
| commit | f20ae5074dfb38f23b0c07c62bdf8e7254a0acf8 (patch) | |
| tree | 36662947bdbec98e40270aa62d221f335acdd41b | |
| parent | 4fb27190879b82e48ce89a56e9d6c04437dbc065 (diff) | |
| download | linux-f20ae5074dfb38f23b0c07c62bdf8e7254a0acf8.tar.xz | |
ALSA: nm256: Don't call card private_free at probe error path
The card destructor of nm256 driver does merely stopping the running
streams, and it's superfluous for the probe error handling. Moreover,
calling this via the previous devres change would lead to another
problem due to the reverse call order.
This patch moves the setup of the private_free callback after the card
registration, so that it can be used only after fully set up.
Fixes: c19935f04784 ("ALSA: nm256: Allocate resources with device-managed APIs")
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20220412102636.16000-40-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/nm256/nm256.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c index c9c178504959..f99a1e96e923 100644 --- a/sound/pci/nm256/nm256.c +++ b/sound/pci/nm256/nm256.c @@ -1573,7 +1573,6 @@ snd_nm256_create(struct snd_card *card, struct pci_dev *pci) chip->coeffs_current = 0; snd_nm256_init_chip(chip); - card->private_free = snd_nm256_free; // pci_set_master(pci); /* needed? */ return 0; @@ -1680,6 +1679,7 @@ static int snd_nm256_probe(struct pci_dev *pci, err = snd_card_register(card); if (err < 0) return err; + card->private_free = snd_nm256_free; pci_set_drvdata(pci, card); return 0; |