Merge "msm: msm_bus: Fix error handling in msm_bus_device_init" (d7f5502d) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c

+18 −28

Original line number	Original line	Diff line number	Diff line
	@@ -949,9 +949,8 @@ static struct device *msm_bus_device_init(

	bus_node = kzalloc(sizeof(struct msm_bus_node_device_type), GFP_KERNEL);		bus_node = kzalloc(sizeof(struct msm_bus_node_device_type), GFP_KERNEL);
	if (!bus_node) {		if (!bus_node) {
	kfree(bus_dev);		ret = -ENOMEM;
	bus_dev = NULL;		goto err_device_init;
	goto exit_device_init;
	}		}
	bus_dev = &bus_node->dev;		bus_dev = &bus_node->dev;
	device_initialize(bus_dev);		device_initialize(bus_dev);
	@@ -959,46 +958,37 @@ static struct device *msm_bus_device_init(
	node_info = devm_kzalloc(bus_dev,		node_info = devm_kzalloc(bus_dev,
	sizeof(struct msm_bus_node_info_type), GFP_KERNEL);		sizeof(struct msm_bus_node_info_type), GFP_KERNEL);
	if (!node_info) {		if (!node_info) {
	devm_kfree(bus_dev, bus_node);		ret = -ENOMEM;
	kfree(bus_dev);		goto err_put_device;
	bus_dev = NULL;
	goto exit_device_init;
	}		}

	bus_node->node_info = node_info;		bus_node->node_info = node_info;
	bus_node->ap_owned = pdata->ap_owned;		bus_node->ap_owned = pdata->ap_owned;
	bus_dev->of_node = pdata->of_node;		bus_dev->of_node = pdata->of_node;

	if (msm_bus_copy_node_info(pdata, bus_dev) < 0) {		ret = msm_bus_copy_node_info(pdata, bus_dev);
	devm_kfree(bus_dev, bus_node);		if (ret)
	devm_kfree(bus_dev, node_info);		goto err_put_device;
	kfree(bus_dev);
	bus_dev = NULL;
	goto exit_device_init;
	}

	bus_dev->bus = &msm_bus_type;		bus_dev->bus = &msm_bus_type;
	dev_set_name(bus_dev, bus_node->node_info->name);		dev_set_name(bus_dev, bus_node->node_info->name);

	ret = device_add(bus_dev);		ret = device_add(bus_dev);
	if (ret < 0) {		if (ret) {
	MSM_BUS_ERR("%s: Error registering device %d",		MSM_BUS_ERR("%s: Error registering device %d",
	__func__, pdata->node_info->id);		__func__, pdata->node_info->id);
	devm_kfree(bus_dev, bus_node);		goto err_put_device;
	devm_kfree(bus_dev, node_info->dev_connections);
	devm_kfree(bus_dev, node_info->connections);
	devm_kfree(bus_dev, node_info->black_connections);
	devm_kfree(bus_dev, node_info->bl_cons);
	devm_kfree(bus_dev, node_info);
	kfree(bus_dev);
	bus_dev = NULL;
	goto exit_device_init;
	}		}
	device_create_file(bus_dev, &dev_attr_bw);		device_create_file(bus_dev, &dev_attr_bw);
	INIT_LIST_HEAD(&bus_node->devlist);		INIT_LIST_HEAD(&bus_node->devlist);

	exit_device_init:
	return bus_dev;		return bus_dev;

			err_put_device:
			put_device(bus_dev);
			bus_dev = NULL;
			kfree(bus_node);
			err_device_init:
			return ERR_PTR(ret);
	}		}

	static int msm_bus_setup_dev_conn(struct device bus_dev, void data)		static int msm_bus_setup_dev_conn(struct device bus_dev, void data)
	@@ -1146,10 +1136,10 @@ static int msm_bus_device_probe(struct platform_device *pdev)

	node_dev = msm_bus_device_init(&pdata->info[i]);		node_dev = msm_bus_device_init(&pdata->info[i]);

	if (!node_dev) {		if (IS_ERR(node_dev)) {
	MSM_BUS_ERR("%s: Error during dev init for %d",		MSM_BUS_ERR("%s: Error during dev init for %d",
	__func__, pdata->info[i].node_info->id);		__func__, pdata->info[i].node_info->id);
	ret = -ENXIO;		ret = PTR_ERR(node_dev);
	goto exit_device_probe;		goto exit_device_probe;
	}		}

drivers/soc/qcom/msm_bus/msm_bus_fabric_rpmh.c

+23 −33

Original line number	Original line	Diff line number	Diff line
	@@ -1561,7 +1561,7 @@ static struct device *msm_bus_device_init(
	struct device *bus_dev = NULL;		struct device *bus_dev = NULL;
	struct msm_bus_node_device_type *bus_node = NULL;		struct msm_bus_node_device_type *bus_node = NULL;
	struct msm_bus_node_info_type *node_info = NULL;		struct msm_bus_node_info_type *node_info = NULL;
	int ret = 0, i = 0;		int ret = -ENODEV, i = 0;

	/*		/*
	* Init here so we can use devm calls		* Init here so we can use devm calls
	@@ -1569,10 +1569,8 @@ static struct device *msm_bus_device_init(

	bus_node = kzalloc(sizeof(struct msm_bus_node_device_type), GFP_KERNEL);		bus_node = kzalloc(sizeof(struct msm_bus_node_device_type), GFP_KERNEL);
	if (!bus_node) {		if (!bus_node) {
	MSM_BUS_ERR("%s:Bus node alloc failed\n", __func__);		ret = -ENOMEM;
	kfree(bus_dev);		goto err_device_init;
	bus_dev = NULL;
	goto exit_device_init;
	}		}
	bus_dev = &bus_node->dev;		bus_dev = &bus_node->dev;
	device_initialize(bus_dev);		device_initialize(bus_dev);
	@@ -1580,11 +1578,8 @@ static struct device *msm_bus_device_init(
	node_info = devm_kzalloc(bus_dev,		node_info = devm_kzalloc(bus_dev,
	sizeof(struct msm_bus_node_info_type), GFP_KERNEL);		sizeof(struct msm_bus_node_info_type), GFP_KERNEL);
	if (!node_info) {		if (!node_info) {
	MSM_BUS_ERR("%s:Bus node info alloc failed\n", __func__);		ret = -ENOMEM;
	devm_kfree(bus_dev, bus_node);		goto err_put_device;
	kfree(bus_dev);
	bus_dev = NULL;
	goto exit_device_init;
	}		}

	bus_node->node_info = node_info;		bus_node->node_info = node_info;
	@@ -1595,8 +1590,10 @@ static struct device *msm_bus_device_init(
	bus_node->qos_bcms = devm_kzalloc(bus_dev,		bus_node->qos_bcms = devm_kzalloc(bus_dev,
	(sizeof(struct qos_bcm_type) *		(sizeof(struct qos_bcm_type) *
	bus_node->num_qos_bcms), GFP_KERNEL);		bus_node->num_qos_bcms), GFP_KERNEL);
	if (!bus_node->qos_bcms)		if (!bus_node->qos_bcms) {
	goto exit_device_init;		ret = -ENOMEM;
			goto err_put_device;
			}
	for (i = 0; i < bus_node->num_qos_bcms; i++) {		for (i = 0; i < bus_node->num_qos_bcms; i++) {
	bus_node->qos_bcms[i].qos_bcm_id =		bus_node->qos_bcms[i].qos_bcm_id =
	pdata->qos_bcms[i].qos_bcm_id;		pdata->qos_bcms[i].qos_bcm_id;
	@@ -1612,36 +1609,29 @@ static struct device *msm_bus_device_init(

	bus_dev->of_node = pdata->of_node;		bus_dev->of_node = pdata->of_node;

	if (msm_bus_copy_node_info(pdata, bus_dev) < 0) {		ret = msm_bus_copy_node_info(pdata, bus_dev);
	devm_kfree(bus_dev, bus_node);		if (ret)
	devm_kfree(bus_dev, node_info);		goto err_put_device;
	kfree(bus_dev);
	bus_dev = NULL;
	goto exit_device_init;
	}

	bus_dev->bus = &msm_bus_type;		bus_dev->bus = &msm_bus_type;
	dev_set_name(bus_dev, bus_node->node_info->name);		dev_set_name(bus_dev, bus_node->node_info->name);

	ret = device_add(bus_dev);		ret = device_add(bus_dev);
	if (ret < 0) {		if (ret) {
	MSM_BUS_ERR("%s: Error registering device %d",		MSM_BUS_ERR("%s: Error registering device %d",
	__func__, pdata->node_info->id);		__func__, pdata->node_info->id);
	devm_kfree(bus_dev, bus_node);		goto err_put_device;
	devm_kfree(bus_dev, node_info->dev_connections);
	devm_kfree(bus_dev, node_info->connections);
	devm_kfree(bus_dev, node_info->black_connections);
	devm_kfree(bus_dev, node_info->bl_cons);
	devm_kfree(bus_dev, node_info);
	kfree(bus_dev);
	bus_dev = NULL;
	goto exit_device_init;
	}		}
	device_create_file(bus_dev, &dev_attr_bw);		device_create_file(bus_dev, &dev_attr_bw);
	INIT_LIST_HEAD(&bus_node->devlist);		INIT_LIST_HEAD(&bus_node->devlist);

	exit_device_init:
	return bus_dev;		return bus_dev;

			err_put_device:
			put_device(bus_dev);
			bus_dev = NULL;
			kfree(bus_node);
			err_device_init:
			return ERR_PTR(ret);
	}		}

	static int msm_bus_setup_dev_conn(struct device bus_dev, void data)		static int msm_bus_setup_dev_conn(struct device bus_dev, void data)
	@@ -1827,10 +1817,10 @@ static int msm_bus_device_probe(struct platform_device *pdev)

	node_dev = msm_bus_device_init(&pdata->info[i]);		node_dev = msm_bus_device_init(&pdata->info[i]);

	if (!node_dev) {		if (IS_ERR(node_dev)) {
	MSM_BUS_ERR("%s: Error during dev init for %d",		MSM_BUS_ERR("%s: Error during dev init for %d",
	__func__, pdata->info[i].node_info->id);		__func__, pdata->info[i].node_info->id);
	ret = -ENXIO;		ret = PTR_ERR(node_dev);
	goto exit_device_probe;		goto exit_device_probe;
	}		}