Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 365dfd44 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "esoc: Fix bugs in esoc_client registration"

parents 577c9570 41418b0d

drivers/esoc/esoc-mdm-4x.c

+2 −0
Original line number Diff line number Diff line
@@ -885,6 +885,7 @@ static int mdm9x25_setup_hw(struct mdm_ctrl *mdm, 
	esoc->clink_ops = ops;

	esoc->parent = mdm->dev;

	esoc->owner = THIS_MODULE;

	esoc->np = pdev->dev.of_node;

	set_esoc_clink_data(esoc, mdm);

	ret = esoc_clink_register(esoc);

	if (ret) {
@@ -957,6 +958,7 @@ static int mdm9x35_setup_hw(struct mdm_ctrl *mdm, 
	esoc->clink_ops = ops;

	esoc->parent = mdm->dev;

	esoc->owner = THIS_MODULE;

	esoc->np = pdev->dev.of_node;

	set_esoc_clink_data(esoc, mdm);

	ret = esoc_clink_register(esoc);

	if (ret) {

drivers/esoc/esoc_client.c

+3 −3
Original line number Diff line number Diff line
@@ -66,15 +66,15 @@ struct esoc_desc *devm_register_esoc_client(struct device *dev, 
		kfree(esoc_prop);

		esoc_node = of_find_node_by_phandle(be32_to_cpup(parp));

		esoc_clink = get_esoc_clink_by_node(esoc_node);

		if (!esoc_clink) {

		if (IS_ERR_OR_NULL(esoc_clink)) {

			dev_err(dev, "matching esoc clink not present\n");

			return NULL;

			return ERR_PTR(-EPROBE_DEFER);

		}

		desc = devres_alloc(devm_esoc_desc_release,

						sizeof(*desc), GFP_KERNEL);

		if (!desc)

			return ERR_PTR(-ENOMEM);

		esoc_name = kasprintf(GFP_KERNEL, "subsys_esoc%d",

		esoc_name = kasprintf(GFP_KERNEL, "esoc%d",

							esoc_clink->id);

		desc->name = esoc_name;

		desc->priv = esoc_clink;

include/linux/esoc_client.h

+18 −0
Original line number Diff line number Diff line
@@ -25,9 +25,27 @@ struct esoc_desc { 
	void *priv;

};



#ifdef CONFIG_ESOC_CLIENT

/* Can return probe deferral */

struct esoc_desc *devm_register_esoc_client(struct device *dev,

							const char *name);

void devm_unregister_esoc_client(struct device *dev,

						struct esoc_desc *esoc_desc);

int esoc_register_client_notifier(struct notifier_block *nb);

#else

static inline struct esoc_desc *devm_register_esoc_client(struct device *dev,

							const char *name)

{

	return NULL;

}

static inline void devm_unregister_esoc_client(struct device *dev,

						struct esoc_desc *esoc_desc)

{

	return;

}

static inline int esoc_register_client_notifier(struct notifier_block *nb)

{

	return -EIO;

}

#endif

#endif