]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
staging: vchiq_arm: Add a matching unregister call
authorPhil Elwell <phil@raspberrypi.com>
Mon, 29 Jun 2020 15:09:06 +0000 (17:09 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 19 Aug 2020 06:16:09 +0000 (08:16 +0200)
[ Upstream commit 5d9272e28a9a6117fb63f5f930991304765caa32 ]

All the registered children of vchiq have a corresponding call to
platform_device_unregister except bcm2835_audio. Fix that.

Fixes: 25c7597af20d ("staging: vchiq_arm: Register a platform device for audio")
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Link: https://lore.kernel.org/r/20200629150945.10720-9-nsaenzjulienne@suse.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

index af6bf0736b5270adab975adbc5ad44376d6c06ac..eb76cc2cbfd8c062d685af1616ff3e226c72cda9 100644 (file)
@@ -3257,6 +3257,7 @@ failed_platform_init:
 
 static int vchiq_remove(struct platform_device *pdev)
 {
+       platform_device_unregister(bcm2835_audio);
        platform_device_unregister(bcm2835_camera);
        vchiq_debugfs_deinit();
        device_destroy(vchiq_class, vchiq_devid);