+++ /dev/null
-From 1ada615db1b97faec9c4625ccfd2cc35d54d850a Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <stefan.wahren@i2se.com>
-Date: Sat, 13 Oct 2018 20:51:23 +0200
-Subject: [PATCH] staging: vchiq_arm: Fix platform device
- unregistration
-
-In error case platform_device_register_data would return an ERR_PTR
-instead of NULL. So we better check this before unregistration.
-
-Fixes: 37b7b3087a2f ("staging/vc04_services: Register a platform device for the camera driver.")
-Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
----
- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-+++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c
-@@ -3656,7 +3656,8 @@ failed_platform_init:
-
- static int vchiq_remove(struct platform_device *pdev)
- {
-- platform_device_unregister(bcm2835_camera);
-+ if (!IS_ERR(bcm2835_camera))
-+ platform_device_unregister(bcm2835_camera);
- vchiq_debugfs_deinit();
- device_destroy(vchiq_class, vchiq_devid);
- class_destroy(vchiq_class);