diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-02-26 13:46:07 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2012-02-27 13:01:42 -0800 |
| commit | 454ca6040acc441221d1b07c38c6127947a223d0 (patch) | |
| tree | 365d768a12a2fa8820d825b5ee03ddd86df4aae3 /arch | |
| parent | c19ce0ab53ad9698968a154647f3dc22aad6c45b (diff) | |
[IA64] Check return from device_register() in cx_device_register()
The device_register() is declared with must_check, causing this:
arch/ia64/sn/kernel/tiocx.c: In function 'cx_device_register':
arch/ia64/sn/kernel/tiocx.c:210:17: warning: ignoring return value of 'device_register', declared with attribute warn_unused_result
Check the return value, and free resources if it fails.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/sn/kernel/tiocx.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c index c1bd1cfda32..2f406f509d4 100644 --- a/arch/ia64/sn/kernel/tiocx.c +++ b/arch/ia64/sn/kernel/tiocx.c @@ -191,6 +191,7 @@ cx_device_register(nasid_t nasid, int part_num, int mfg_num, struct hubdev_info *hubdev, int bt) { struct cx_dev *cx_dev; + int r; cx_dev = kzalloc(sizeof(struct cx_dev), GFP_KERNEL); DBG("cx_dev= 0x%p\n", cx_dev); @@ -207,7 +208,11 @@ cx_device_register(nasid_t nasid, int part_num, int mfg_num, cx_dev->dev.bus = &tiocx_bus_type; cx_dev->dev.release = tiocx_bus_release; dev_set_name(&cx_dev->dev, "%d", cx_dev->cx_id.nasid); - device_register(&cx_dev->dev); + r = device_register(&cx_dev->dev); + if (r) { + kfree(cx_dev); + return r; + } get_device(&cx_dev->dev); device_create_file(&cx_dev->dev, &dev_attr_cxdev_control); |