2010-07-27 14:08:09

by Matthew Garrett

[permalink] [raw]
Subject: [PATCH] ipmi: Check the return status of open firmware device registration

If the registration of the Open Firmware IPMI device fails then we may
attempt to unregister a device that doesn't exist. Check the return code.

Signed-off-by: Matthew Garrett <[email protected]>
Cc: Corey Minyard <[email protected]>
---
drivers/char/ipmi/ipmi_si_intf.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 094bdc3..e39a744 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -3337,8 +3337,11 @@ static __devinit int init_ipmi_si(void)
#endif

#ifdef CONFIG_PPC_OF
- of_register_platform_driver(&ipmi_of_platform_driver);
- of_registered = 1;
+ rv = of_register_platform_driver(&ipmi_of_platform_driver);
+ if (rv)
+ printk(KERN_ERR PFX "Unable to register OF driver: %d\n", rv);
+ else
+ of_registered = 1;
#endif

/* We prefer devices with interrupts, but in the case of a machine
--
1.7.1.1