diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-04-12 12:26:35 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-04-12 17:58:43 +0200 |
| commit | 4fb27190879b82e48ce89a56e9d6c04437dbc065 (patch) | |
| tree | 7f440dd8fb594f8fa38b1481eff7db7bb684dd61 /sound/drivers | |
| parent | b2aa4f80693b7841e5ac4eadbd2d8cec56b10a51 (diff) | |
| download | linux-stable-4fb27190879b82e48ce89a56e9d6c04437dbc065.tar.gz linux-stable-4fb27190879b82e48ce89a56e9d6c04437dbc065.tar.bz2 linux-stable-4fb27190879b82e48ce89a56e9d6c04437dbc065.zip | |
ALSA: mtpav: Don't call card private_free at probe error path
The card destructor of nm256 driver does merely stopping the running
timer, 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: aa92050f10f0 ("ALSA: mtpav: Allocate resources with device-managed APIs")
Link: https://lore.kernel.org/r/20220412102636.16000-39-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/drivers')
| -rw-r--r-- | sound/drivers/mtpav.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c index 11235baaf6fa..f212f233ea61 100644 --- a/sound/drivers/mtpav.c +++ b/sound/drivers/mtpav.c @@ -693,8 +693,6 @@ static int snd_mtpav_probe(struct platform_device *dev) mtp_card->outmidihwport = 0xffffffff; timer_setup(&mtp_card->timer, snd_mtpav_output_timer, 0); - card->private_free = snd_mtpav_free; - err = snd_mtpav_get_RAWMIDI(mtp_card); if (err < 0) return err; @@ -716,6 +714,8 @@ static int snd_mtpav_probe(struct platform_device *dev) if (err < 0) return err; + card->private_free = snd_mtpav_free; + platform_set_drvdata(dev, card); printk(KERN_INFO "Motu MidiTimePiece on parallel port irq: %d ioport: 0x%lx\n", irq, port); return 0; |