| From 73114e4b04cbb9eff1b22bcebc77ba46b0505bff Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 29 Jun 2020 17:09:06 +0200 |
| Subject: staging: vchiq_arm: Add a matching unregister call |
| |
| From: Phil Elwell <phil@raspberrypi.com> |
| |
| [ 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 | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c |
| index a1ea9777a4445..73b1099c4b453 100644 |
| --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c |
| +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c |
| @@ -2803,6 +2803,7 @@ static int vchiq_probe(struct platform_device *pdev) |
| |
| 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); |
| -- |
| 2.25.1 |
| |
