Commit fbfb14455391b89edcf37327526988dea7849532
Committed by
Greg Kroah-Hartman
1 parent
cb360bbf63
Exists in
master
and in
7 other branches
driver core fixes: device_register() retval check in platform.c
Check the return value of device_register() in platform_bus_init(). Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Showing 1 changed file with 9 additions and 2 deletions Side-by-side Diff
drivers/base/platform.c
... | ... | @@ -611,8 +611,15 @@ |
611 | 611 | |
612 | 612 | int __init platform_bus_init(void) |
613 | 613 | { |
614 | - device_register(&platform_bus); | |
615 | - return bus_register(&platform_bus_type); | |
614 | + int error; | |
615 | + | |
616 | + error = device_register(&platform_bus); | |
617 | + if (error) | |
618 | + return error; | |
619 | + error = bus_register(&platform_bus_type); | |
620 | + if (error) | |
621 | + device_unregister(&platform_bus); | |
622 | + return error; | |
616 | 623 | } |
617 | 624 | |
618 | 625 | #ifndef ARCH_HAS_DMA_GET_REQUIRED_MASK |