diff options
| author | Takashi Iwai <tiwai@suse.de> | 2021-01-07 18:51:39 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-01-07 18:51:39 +0100 |
| commit | 7b62275507232f01f66d3e7d05c77bbd9009b726 (patch) | |
| tree | 172dd8a7632877df2b623462bc871ab42e093bcc /sound/ppc | |
| parent | 91bc156817a3c2007332b64b4f85c32aafbbbea6 (diff) | |
| parent | 1f092d1c8819679d78a7d9c62a46d4939d217a9d (diff) | |
Merge tag 'asoc-fix-v5.11-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.11
A collection of mostly driver specific fixes, plus a maintainership
update for TI and a fix for DAPM driver removal paths.
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/snd_ps3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index 966b709ee286..631a61ce52f4 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -1044,7 +1044,7 @@ clean_open: }; /* snd_ps3_probe */ /* called when module removal */ -static int snd_ps3_driver_remove(struct ps3_system_bus_device *dev) +static void snd_ps3_driver_remove(struct ps3_system_bus_device *dev) { int ret; pr_info("%s:start id=%d\n", __func__, dev->match_id); @@ -1070,7 +1070,6 @@ static int snd_ps3_driver_remove(struct ps3_system_bus_device *dev) lv1_gpu_device_unmap(2); ps3_close_hv_device(dev); pr_info("%s:end id=%d\n", __func__, dev->match_id); - return 0; } /* snd_ps3_remove */ static struct ps3_system_bus_driver snd_ps3_bus_driver_info = { |