diff options
Diffstat (limited to 'drivers/rpmsg/qcom_smd.c')
| -rw-r--r-- | drivers/rpmsg/qcom_smd.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index 8da83a4ebadc..4abbeea782fa 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c @@ -1122,8 +1122,10 @@ static struct qcom_smd_channel *qcom_smd_create_channel(struct qcom_smd_edge *ed channel->edge = edge; channel->name = kstrdup(name, GFP_KERNEL); - if (!channel->name) - return ERR_PTR(-ENOMEM); + if (!channel->name) { + ret = -ENOMEM; + goto free_channel; + } spin_lock_init(&channel->tx_lock); spin_lock_init(&channel->recv_lock); @@ -1173,6 +1175,7 @@ static struct qcom_smd_channel *qcom_smd_create_channel(struct qcom_smd_edge *ed free_name_and_channel: kfree(channel->name); +free_channel: kfree(channel); return ERR_PTR(ret); @@ -1454,7 +1457,7 @@ struct qcom_smd_edge *qcom_smd_register_edge(struct device *parent, edge->dev.release = qcom_smd_edge_release; edge->dev.of_node = node; edge->dev.groups = qcom_smd_edge_groups; - dev_set_name(&edge->dev, "%s:%s", dev_name(parent), node->name); + dev_set_name(&edge->dev, "%s:%pOFn", dev_name(parent), node); ret = device_register(&edge->dev); if (ret) { pr_err("failed to register smd edge\n"); |