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

Commit ce550362 authored by Petr Cvek's avatar Petr Cvek Committed by Mauro Carvalho Chehab
Browse files

[media] pxa_camera: Fix a call with an uninitialized device pointer 



In 'commit 295ab497 ("[media] media: platform: pxa_camera: make
printk consistent")' a pointer to the device structure in
mclk_get_divisor() was changed to pcdev_to_dev(pcdev). The pointer used
by pcdev_to_dev() is still uninitialized during the call to
mclk_get_divisor() as it happens in v4l2_device_register() at the end
of the probe. The dev_warn and dev_dbg caused a line in the log:

	(NULL device *): Limiting master clock to 26000000

Fix this by using an initialized pointer from the platform_device
(as before the old patch).

Signed-off-by: default avatarPetr Cvek <petr.cvek@tul.cz>
Acked-by: default avatarRobert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent a065c2e5

drivers/media/platform/pxa_camera.c

+2 −2
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ static u32 mclk_get_divisor(struct platform_device *pdev, 
	/* mclk <= ciclk / 4 (27.4.2) */

	if (mclk > lcdclk / 4) {

		mclk = lcdclk / 4;

		dev_warn(pcdev_to_dev(pcdev),

		dev_warn(&pdev->dev,

			 "Limiting master clock to %lu\n", mclk);

	}
@@ -1135,7 +1135,7 @@ static u32 mclk_get_divisor(struct platform_device *pdev, 
	if (pcdev->platform_flags & PXA_CAMERA_MCLK_EN)

		pcdev->mclk = lcdclk / (2 * (div + 1));



	dev_dbg(pcdev_to_dev(pcdev), "LCD clock %luHz, target freq %luHz, divisor %u\n",

	dev_dbg(&pdev->dev, "LCD clock %luHz, target freq %luHz, divisor %u\n",

		lcdclk, mclk, div);



	return div;