summaryrefslogtreecommitdiff
path: root/sound/soc/atmel/mikroe-proto.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2022-08-01 08:11:19 +0200
committerTakashi Iwai <tiwai@suse.de>2022-08-01 08:11:19 +0200
commit9769e44d41a1359b9000ff8458f0f2f66080ebf4 (patch)
treee91d2d71fd469c2fa9289fed87f0bb4fded196a5 /sound/soc/atmel/mikroe-proto.c
parentf38e6458e16df7bac3871f4e69f9681c0b3c58bd (diff)
parentbe561ffad708f0cee18aee4231f80ffafaf7a419 (diff)
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/soc/atmel/mikroe-proto.c')
-rw-r--r--sound/soc/atmel/mikroe-proto.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/atmel/mikroe-proto.c b/sound/soc/atmel/mikroe-proto.c
index ce46d8a0b7e4..954460719aa3 100644
--- a/sound/soc/atmel/mikroe-proto.c
+++ b/sound/soc/atmel/mikroe-proto.c
@@ -157,7 +157,9 @@ put_codec_node:
static int snd_proto_remove(struct platform_device *pdev)
{
- return snd_soc_unregister_card(&snd_proto);
+ snd_soc_unregister_card(&snd_proto);
+
+ return 0;
}
static const struct of_device_id snd_proto_of_match[] = {