1 files changed, 16 insertions, 11 deletions

diff --git a/drivers/message/i2o/device.c b/drivers/message/i2o/device.c
index ee183053fa23..b9df143e4ff1 100644
--- a/drivers/message/i2o/device.c
+++ b/drivers/message/i2o/device.c
@@ -54,8 +54,8 @@ static inline int i2o_device_issue_claim(struct i2o_device *dev, u32 cmd,
  *      @dev: I2O device to claim
  *      @drv: I2O driver which wants to claim the device
  *
- *      Do the leg work to assign a device to a given OSM. If the claim succeed
- *      the owner of the rimary. If the attempt fails a negative errno code
+ *      Do the leg work to assign a device to a given OSM. If the claim succeeds,
+ *      the owner is the primary. If the attempt fails a negative errno code
  *      is returned. On success zero is returned.
  */
 int i2o_device_claim(struct i2o_device *dev)
@@ -208,24 +208,23 @@ static struct i2o_device *i2o_device_alloc(void)
 
 /**
  *      i2o_device_add - allocate a new I2O device and add it to the IOP
- *      @iop: I2O controller where the device is on
+ *      @c: I2O controller that the device is on
  *      @entry: LCT entry of the I2O device
  *
  *      Allocate a new I2O device and initialize it with the LCT entry. The
  *      device is appended to the device list of the controller.
  *
- *      Returns a pointer to the I2O device on success or negative error code
- *      on failure.
+ *      Returns zero on success, or a -ve errno.
  */
-static struct i2o_device *i2o_device_add(struct i2o_controller *c,
-                                         i2o_lct_entry * entry)
+static int i2o_device_add(struct i2o_controller *c, i2o_lct_entry *entry)
 {
         struct i2o_device *i2o_dev, *tmp;
+        int rc;
 
         i2o_dev = i2o_device_alloc();
         if (IS_ERR(i2o_dev)) {
                 printk(KERN_ERR "i2o: unable to allocate i2o device\n");
-                return i2o_dev;
+                return PTR_ERR(i2o_dev);
         }
 
         i2o_dev->lct_data = *entry;
@@ -236,7 +235,9 @@ static struct i2o_device *i2o_device_add(struct i2o_controller *c,
         i2o_dev->iop = c;
         i2o_dev->device.parent = &c->device;
 
-        device_register(&i2o_dev->device);
+        rc = device_register(&i2o_dev->device);
+        if (rc)
+                goto err;
 
         list_add_tail(&i2o_dev->list, &c->devices);
 
@@ -270,12 +271,16 @@ static struct i2o_device *i2o_device_add(struct i2o_controller *c,
 
         pr_debug("i2o: device %s added\n", i2o_dev->device.bus_id);
 
-        return i2o_dev;
+        return 0;
+
+err:
+        kfree(i2o_dev);
+        return rc;
 }
 
 /**
  *      i2o_device_remove - remove an I2O device from the I2O core
- *      @dev: I2O device which should be released
+ *      @i2o_dev: I2O device which should be released
  *
  *      Is used on I2O controller removal or LCT modification, when the device
  *      is removed from the system. Note that the device could still hang