@@ -828,7 +828,10 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent,
if (!ctlr->devloss_work_q)
goto out_del_q;
- dev_set_name(&ctlr->dev, "ctlr_%d", ctlr->id);
+ error = dev_set_name(&ctlr->dev, "ctlr_%d", ctlr->id);
+ if (error)
+ goto out_del_q2;
+
error = device_register(&ctlr->dev);
if (error)
goto out_del_q2;
@@ -1024,7 +1027,9 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr,
fcf->dev_loss_tmo = ctlr->fcf_dev_loss_tmo;
- dev_set_name(&fcf->dev, "fcf_%d", fcf->id);
+ error = dev_set_name(&fcf->dev, "fcf_%d", fcf->id);
+ if (error)
+ goto out_del;
fcf->fabric_name = new_fcf->fabric_name;
fcf->switch_name = new_fcf->switch_name;
It's possible that dev_set_name() returns -ENOMEM, catch and handle this. Signed-off-by: Bo Liu <liubo03@inspur.com> --- drivers/scsi/fcoe/fcoe_sysfs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)