I2O: handle a few sysfs errors
PATCH 1/1 I2O: handle a few sysfs errors
Signed-off-by Jeff Garzik <[email protected]>
---
This was just the low-hanging fruit. There are more unchecked-return calls in there.
drivers/message/i2o/bus-osm.c | 12 ++++++++++-- drivers/message/i2o/exec-osm.c | 17 ++++++++++++++--- 2 files changed, 24 insertions(+), 5 deletions(-)
drivers/message/i2o/bus-osm.c +10 -2
@@ -80,18 +80,26 @@ static DEVICE_ATTR(scan, S_IWUSR, NULL,* @dev: device to verify if it is a I2O Bus Adapter device * * Because we want all Bus Adapters always return 0. +* Except when we fail. Then we are sad. * -* Returns 0. +* Returns 0, except when we fail to excel. */ static int i2o_bus_probe (struct device *dev) {struct i2o_device *i2o_dev =to_i2o_device (get_device (dev)); +int rc; -device_create_file (dev, &dev_attr_scan); + rc =device_create_file (dev, &dev_attr_scan); +if (rc) + goto err_out;osm_info ("device added (TID: %03x)\n" , i2o_dev->lct_data.tid);return 0 ; + +err_out: +put_device (dev); +return rc; };/**
drivers/message/i2o/exec-osm.c +14 -3
@@ -325,13 +325,24 @@ static DEVICE_ATTR(product_id, S_IRUGO,static int i2o_exec_probe (struct device *dev) {struct i2o_device *i2o_dev =to_i2o_device (dev); +int rc; -i2o_event_register (i2o_dev, &i2o_exec_driver,0 ,0xffffffff ); + rc =i2o_event_register (i2o_dev, &i2o_exec_driver,0 ,0xffffffff ); +if (rc) goto err_out; -device_create_file (dev, &dev_attr_vendor_id); -device_create_file (dev, &dev_attr_product_id); + rc =device_create_file (dev, &dev_attr_vendor_id); +if (rc) goto err_evtreg; + rc =device_create_file (dev, &dev_attr_product_id); +if (rc) goto err_vid;return 0 ; + +err_vid: +device_remove_file (dev, &dev_attr_vendor_id); +err_evtreg: +i2o_event_register (to_i2o_device (dev), &i2o_exec_driver,0 ,0 ); +err_out: +return rc; };/**