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

Commit 02249369 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mauro Carvalho Chehab
Browse files

[media] soc_camera: Use devm_kzalloc function 



devm_kzalloc() has been used to simplify error handling.
While at it, the soc_camera_device_register function has been moved to
save a few lines of code and a variable.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
[g.liakhovetski@gmx.de: remove a superfluous empty line]
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent ec0341b3

drivers/media/platform/soc_camera/soc_camera.c

+2 −14
Original line number Diff line number Diff line
@@ -1529,12 +1529,11 @@ static int __devinit soc_camera_pdrv_probe(struct platform_device *pdev) 
{

	struct soc_camera_link *icl = pdev->dev.platform_data;

	struct soc_camera_device *icd;

	int ret;



	if (!icl)

		return -EINVAL;



	icd = kzalloc(sizeof(*icd), GFP_KERNEL);

	icd = devm_kzalloc(&pdev->dev, sizeof(*icd), GFP_KERNEL);

	if (!icd)

		return -ENOMEM;
@@ -1543,19 +1542,10 @@ static int __devinit soc_camera_pdrv_probe(struct platform_device *pdev) 
	icd->pdev = &pdev->dev;

	platform_set_drvdata(pdev, icd);



	ret = soc_camera_device_register(icd);

	if (ret < 0)

		goto escdevreg;



	icd->user_width		= DEFAULT_WIDTH;

	icd->user_height	= DEFAULT_HEIGHT;



	return 0;



escdevreg:

	kfree(icd);



	return ret;

	return soc_camera_device_register(icd);

}



/*
@@ -1572,8 +1562,6 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev) 


	list_del(&icd->list);



	kfree(icd);



	return 0;

}