Skip to content

Commit

Permalink
V4L/DVB (12330): pxa_camera: Fix Oops in pxa_camera_probe
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Antonio Ospite authored and Mauro Carvalho Chehab committed Aug 13, 2009
1 parent 3493e84 commit 5b76618
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/media/video/pxa_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -1579,6 +1579,7 @@ static int __devinit pxa_camera_probe(struct platform_device *pdev)
pcdev->mclk = 20000000;
}

pcdev->soc_host.dev = &pdev->dev;
pcdev->mclk_divisor = mclk_get_divisor(pcdev);

INIT_LIST_HEAD(&pcdev->capture);
Expand Down Expand Up @@ -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.ops = &pxa_soc_camera_host_ops;
pcdev->soc_host.priv = pcdev;
pcdev->soc_host.dev = &pdev->dev;
pcdev->soc_host.nr = pdev->id;

err = soc_camera_host_register(&pcdev->soc_host);
Expand Down

0 comments on commit 5b76618

Please sign in to comment.