iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] V4L: omap1-camera: fix Oops with NULL platform data

Browse Source 
Consistently check for platform data != NULL before dereferencing.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Guennadi Liakhovetski 2011-08-22 12:57:45 -03:00 committed by Mauro Carvalho Chehab
parent 6ac939c06f
commit 2b3d0457b8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/media/video/omap1_camera.c
View File

@ -1579,10 +1579,10 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
pcdev->clk = clk; pcdev->clk = clk;
pcdev->pdata = pdev->dev.platform_data; pcdev->pdata = pdev->dev.platform_data;
pcdev->pflags = pcdev->pdata->flags; if (pcdev->pdata) {
pcdev->pflags = pcdev->pdata->flags;
if (pcdev->pdata)
pcdev->camexclk = pcdev->pdata->camexclk_khz * 1000; pcdev->camexclk = pcdev->pdata->camexclk_khz * 1000;
}
switch (pcdev->camexclk) { switch (pcdev->camexclk) {
case 6000000: case 6000000:
@ -1592,6 +1592,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
case 24000000: case 24000000:
break; break;
default: default:
/* pcdev->camexclk != 0 => pcdev->pdata != NULL */
dev_warn(&pdev->dev, dev_warn(&pdev->dev,
"Incorrect sensor clock frequency %ld kHz, " "Incorrect sensor clock frequency %ld kHz, "
"should be one of 0, 6, 8, 9.6, 12 or 24 MHz, " "should be one of 0, 6, 8, 9.6, 12 or 24 MHz, "
@ -1599,8 +1600,7 @@ static int __init omap1_cam_probe(struct platform_device *pdev)
pcdev->pdata->camexclk_khz); pcdev->pdata->camexclk_khz);
pcdev->camexclk = 0; pcdev->camexclk = 0;
case 0: case 0:
dev_info(&pdev->dev, dev_info(&pdev->dev, "Not providing sensor clock\n");
"Not providing sensor clock\n");
} }
INIT_LIST_HEAD(&pcdev->capture); INIT_LIST_HEAD(&pcdev->capture);