diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-02-15 09:06:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-02-15 09:07:01 +0100 |
| commit | de1528ee7cb7c161444dadbc971d050bebb5cbe7 (patch) | |
| tree | a1f53cd279966802de097c0f0f6625b49e6903f1 /sound/isa/cmi8328.c | |
| parent | 0d3070f5e6551d8a759619e85736e49a3bf40398 (diff) | |
| parent | 15447b64789d9ade71eb374d5ae1f37d0bbce0bd (diff) | |
Merge branch 'for-next' into for-linus
Unification of 5.12-devel branches.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/isa/cmi8328.c')
| -rw-r--r-- | sound/isa/cmi8328.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/isa/cmi8328.c b/sound/isa/cmi8328.c index faca5dd95bfe..3b9fbb02864b 100644 --- a/sound/isa/cmi8328.c +++ b/sound/isa/cmi8328.c @@ -403,7 +403,7 @@ error: return err; } -static int snd_cmi8328_remove(struct device *pdev, unsigned int dev) +static void snd_cmi8328_remove(struct device *pdev, unsigned int dev) { struct snd_card *card = dev_get_drvdata(pdev); struct snd_cmi8328 *cmi = card->private_data; @@ -420,7 +420,6 @@ static int snd_cmi8328_remove(struct device *pdev, unsigned int dev) snd_cmi8328_cfg_write(cmi->port, CFG2, 0); snd_cmi8328_cfg_write(cmi->port, CFG3, 0); snd_card_free(card); - return 0; } #ifdef CONFIG_PM |