From: Greg Kroah-Hartman Date: Tue, 19 Oct 2021 06:13:49 +0000 (+0200) Subject: fix up queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch X-Git-Tag: v4.14.252~2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b021909e136ab97fccb6d7a575acbb232649acc0;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch --- diff --git a/queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch b/queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch index 33fb7708012..c0751c0c344 100644 --- a/queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch +++ b/queue-5.14/firmware-arm_ffa-add-missing-remove-callback-to-ffa_bus_type.patch @@ -24,26 +24,28 @@ Tested-by: Jens Wiklander Signed-off-by: Sudeep Holla Signed-off-by: Greg Kroah-Hartman --- - drivers/firmware/arm_ffa/bus.c | 8 ++++++++ - 1 file changed, 8 insertions(+) + drivers/firmware/arm_ffa/bus.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) --- a/drivers/firmware/arm_ffa/bus.c +++ b/drivers/firmware/arm_ffa/bus.c -@@ -49,6 +49,13 @@ static int ffa_device_probe(struct devic +@@ -49,6 +49,15 @@ static int ffa_device_probe(struct devic return ffa_drv->probe(ffa_dev); } -+static void ffa_device_remove(struct device *dev) ++static int ffa_device_remove(struct device *dev) +{ + struct ffa_driver *ffa_drv = to_ffa_driver(dev->driver); + + ffa_drv->remove(to_ffa_dev(dev)); ++ ++ return 0; +} + static int ffa_device_uevent(struct device *dev, struct kobj_uevent_env *env) { struct ffa_device *ffa_dev = to_ffa_dev(dev); -@@ -86,6 +93,7 @@ struct bus_type ffa_bus_type = { +@@ -86,6 +95,7 @@ struct bus_type ffa_bus_type = { .name = "arm_ffa", .match = ffa_device_match, .probe = ffa_device_probe,