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: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
committed by
Mauro Carvalho Chehab
parent
3493e84de6
commit
5b766182a1
@@ -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);
|
||||||
|
Reference in New Issue
Block a user