diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:06:50 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-12-16 09:06:50 +0100 |
commit | b3bb164aa56018ad8476dd2953b654491b7fb468 (patch) | |
tree | 781240b23aa2613222aac1aa633a9e4f86a934ec /drivers/staging/vc04_services | |
parent | f59aba2f75795e5b6a4f1aa31f3e20d7b71ca804 (diff) | |
parent | d1eef1c619749b2a57e514a3fa67d9a516ffa919 (diff) |
Merge 5.5-rc2 into staging-next
We want the staging driver fixes in here, and this resolves merge issues
with the isdn code that was pointed out in linux-next
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vc04_services')
-rw-r--r-- | drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 02148a24818a..4458c1e60fa3 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -3309,7 +3309,7 @@ static int __init vchiq_driver_init(void) return 0; region_unregister: - platform_driver_unregister(&vchiq_driver); + unregister_chrdev_region(vchiq_devid, 1); class_destroy: class_destroy(vchiq_class); |