From: Russell King Date: Sat, 3 Sep 2016 08:14:58 +0000 (+0100) Subject: ARM: sa1111: ensure we only touch RAB bus type devices when removing X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=eac8dbf74f30479b70b9a53f3b24285bd6229d09;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git ARM: sa1111: ensure we only touch RAB bus type devices when removing When removing a SA1111 device, we try to remove all child devices. However, we must only remove our own RAB bus typed devices from the tree, there may be other devices present which should not be touched. This is necessary before we introduce gpiochip to SA1111 to avoid incorrectly trying to remove the gpiochip device, leading to an oops in __release_resource(). Signed-off-by: Russell King --- diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index 2e076c492005..303c62861d84 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -815,6 +815,8 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq) static int sa1111_remove_one(struct device *dev, void *data) { struct sa1111_dev *sadev = SA1111_DEV(dev); + if (dev->bus != &sa1111_bus_type) + return 0; device_del(&sadev->dev); release_resource(&sadev->res); put_device(&sadev->dev);