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

Commit 5b766182 authored by Antonio Ospite's avatar Antonio Ospite Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (12330): pxa_camera: Fix Oops in pxa_camera_probe 



mclk_get_divisor uses pcdev->soc_host.dev, make sure it is initialized.

Signed-off-by: default avatarAntonio Ospite <ospite@studenti.unina.it>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3493e84d

drivers/media/video/pxa_camera.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1579,6 +1579,7 @@ static int __devinit pxa_camera_probe(struct platform_device *pdev) 
		pcdev->mclk = 20000000;

		pcdev->mclk = 20000000;

	}

	}





	pcdev->soc_host.dev = &pdev->dev;

	pcdev->mclk_divisor = mclk_get_divisor(pcdev);

	pcdev->mclk_divisor = mclk_get_divisor(pcdev);





	INIT_LIST_HEAD(&pcdev->capture);

	INIT_LIST_HEAD(&pcdev->capture);
@@ -1644,7 +1645,6 @@ static int __devinit pxa_camera_probe(struct platform_device *pdev) 
	pcdev->soc_host.drv_name	= PXA_CAM_DRV_NAME;

	pcdev->soc_host.drv_name	= PXA_CAM_DRV_NAME;

	pcdev->soc_host.ops		= &pxa_soc_camera_host_ops;

	pcdev->soc_host.ops		= &pxa_soc_camera_host_ops;

	pcdev->soc_host.priv		= pcdev;

	pcdev->soc_host.priv		= pcdev;

	pcdev->soc_host.dev		= &pdev->dev;

	pcdev->soc_host.nr		= pdev->id;

	pcdev->soc_host.nr		= pdev->id;





	err = soc_camera_host_register(&pcdev->soc_host);

	err = soc_camera_host_register(&pcdev->soc_host);