X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch;fp=target%2Flinux%2Fbrcm2708%2Fpatches-4.19%2F950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch;h=0000000000000000000000000000000000000000;hb=67dcc43f3a22dc3a7ac07a7065971b426feeb043;hp=69bd5204616772e729771d44ff1842eca5f3c3bd;hpb=47a93a810f78adce5a130d287f82b28e9b54313c;p=openwrt%2Fopenwrt.git diff --git a/target/linux/brcm2708/patches-4.19/950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch b/target/linux/brcm2708/patches-4.19/950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch deleted file mode 100644 index 69bd520461..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0229-staging-vchiq_arm-Fix-platform-device-unregistration.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1ada615db1b97faec9c4625ccfd2cc35d54d850a Mon Sep 17 00:00:00 2001 -From: Stefan Wahren -Date: Sat, 13 Oct 2018 20:51:23 +0200 -Subject: [PATCH 229/806] 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 ---- - 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);