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

Commit a87903f3 authored by Ian Molton's avatar Ian Molton Committed by Samuel Ortiz
Browse files

mfd: reduce stack usage in mfd-core.c 



This patch moves the allocation of the resources off the stack in
mfd_add_device().

Signed-off-by: default avatarIan Molton <spyro@f2s.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@openedhand.com>
parent 0cfd8103

drivers/mfd/mfd-core.c

+11 −4
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ static int mfd_add_device(struct device *parent, int id, 
			  struct resource *mem_base,

			  int irq_base)

{

	struct resource res[cell->num_resources];

	struct resource *res;

	struct platform_device *pdev;

	int ret = -ENOMEM;

	int r;
@@ -29,14 +29,17 @@ static int mfd_add_device(struct device *parent, int id, 
	if (!pdev)

		goto fail_alloc;



	res = kzalloc(sizeof(*res) * cell->num_resources, GFP_KERNEL);

	if (!res)

		goto fail_device;



	pdev->dev.parent = parent;



	ret = platform_device_add_data(pdev,

			cell->platform_data, cell->data_size);

	if (ret)

		goto fail_device;

		goto fail_res;



	memset(res, 0, sizeof(res));

	for (r = 0; r < cell->num_resources; r++) {

		res[r].name = cell->resources[r].name;

		res[r].flags = cell->resources[r].flags;
@@ -64,11 +67,15 @@ static int mfd_add_device(struct device *parent, int id, 


	ret = platform_device_add(pdev);

	if (ret)

		goto fail_device;

		goto fail_res;



	kfree(res);



	return 0;



/*	platform_device_del(pdev); */

fail_res:

	kfree(res);

fail_device:

	platform_device_put(pdev);

fail_alloc: