From 6223960513e2fa6d1acc85a655148d8e952038e5 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Sun, 26 Feb 2012 13:46:07 -0500 Subject: [PATCH] --- yaml --- r: 295294 b: refs/heads/master c: 454ca6040acc441221d1b07c38c6127947a223d0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/tiocx.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1f75b0bf12e0..661c6b430402 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c19ce0ab53ad9698968a154647f3dc22aad6c45b +refs/heads/master: 454ca6040acc441221d1b07c38c6127947a223d0 diff --git a/trunk/arch/ia64/sn/kernel/tiocx.c b/trunk/arch/ia64/sn/kernel/tiocx.c index c1bd1cfda327..2f406f509d44 100644 --- a/trunk/arch/ia64/sn/kernel/tiocx.c +++ b/trunk/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);