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

Commit 55b51899 authored by Todor Tomov's avatar Todor Tomov Committed by Mauro Carvalho Chehab
Browse files

media: camss: Use managed memory allocations 



Use managed memory allocations for structs which are used until
the driver is removed.

Signed-off-by: default avatarTodor Tomov <todor.tomov@linaro.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 44a9ffd4

drivers/media/platform/qcom/camss/camss-ispif.c

+2 −2
Original line number Diff line number Diff line
@@ -1076,7 +1076,7 @@ int msm_ispif_subdev_init(struct ispif_device *ispif, 
	else

		return -EINVAL;



	ispif->line = kcalloc(ispif->line_num, sizeof(*ispif->line),

	ispif->line = devm_kcalloc(dev, ispif->line_num, sizeof(*ispif->line),

				   GFP_KERNEL);

	if (!ispif->line)

		return -ENOMEM;

drivers/media/platform/qcom/camss/camss.c

+6 −5
Original line number Diff line number Diff line
@@ -848,17 +848,18 @@ static int camss_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	camss->csiphy = kcalloc(camss->csiphy_num, sizeof(*camss->csiphy),

				GFP_KERNEL);

	camss->csiphy = devm_kcalloc(dev, camss->csiphy_num,

				     sizeof(*camss->csiphy), GFP_KERNEL);

	if (!camss->csiphy)

		return -ENOMEM;



	camss->csid = kcalloc(camss->csid_num, sizeof(*camss->csid),

	camss->csid = devm_kcalloc(dev, camss->csid_num, sizeof(*camss->csid),

				   GFP_KERNEL);

	if (!camss->csid)

		return -ENOMEM;



	camss->vfe = kcalloc(camss->vfe_num, sizeof(*camss->vfe), GFP_KERNEL);

	camss->vfe = devm_kcalloc(dev, camss->vfe_num, sizeof(*camss->vfe),

				  GFP_KERNEL);

	if (!camss->vfe)

		return -ENOMEM;