diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-07-22 22:20:50 +0200 |
|---|---|---|
| committer | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2009-07-22 22:20:50 +0200 |
| commit | 72e561371a01666dd61a04af3cc6c0eac757f542 (patch) | |
| tree | 83a3d4ed2c12fc132e7297978c531a5a7818f9c5 /linux/drivers | |
| parent | d614ff9f8b6297350f6d1690599733960e186b77 (diff) | |
| download | mediapointer-dvb-s2-72e561371a01666dd61a04af3cc6c0eac757f542.tar.gz mediapointer-dvb-s2-72e561371a01666dd61a04af3cc6c0eac757f542.tar.bz2 | |
pxa_camera: Fix Oops in pxa_camera_probe.
From: Antonio Ospite <ospite@studenti.unina.it>
mclk_get_divisor uses pcdev->soc_host.dev, make sure it is initialized.
Priority: high
Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/pxa_camera.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/pxa_camera.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/pxa_camera.c b/linux/drivers/media/video/pxa_camera.c index 8964d60cd..3f1b63e4e 100644 --- a/linux/drivers/media/video/pxa_camera.c +++ b/linux/drivers/media/video/pxa_camera.c @@ -1591,6 +1591,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); @@ -1656,7 +1657,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); |