summaryrefslogtreecommitdiffstats
path: root/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0008-omap3beagle-camera-Fix-null-pointer-dereference.patch
diff options
context:
space:
mode:
Diffstat (limited to 'extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0008-omap3beagle-camera-Fix-null-pointer-dereference.patch')
-rw-r--r--extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0008-omap3beagle-camera-Fix-null-pointer-dereference.patch54
1 files changed, 54 insertions, 0 deletions
diff --git a/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0008-omap3beagle-camera-Fix-null-pointer-dereference.patch b/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0008-omap3beagle-camera-Fix-null-pointer-dereference.patch
new file mode 100644
index 00000000..ecc83965
--- /dev/null
+++ b/extras/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0008-omap3beagle-camera-Fix-null-pointer-dereference.patch
@@ -0,0 +1,54 @@
1From c46eeb468f9bb69ca4c82abd1ff07e0f35aaa50f Mon Sep 17 00:00:00 2001
2From: Sergio Aguirre <saaguirre@ti.com>
3Date: Fri, 11 Jun 2010 17:53:50 -0500
4Subject: [PATCH 08/75] omap3beagle: camera: Fix null pointer dereference
5
6Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
7---
8 arch/arm/mach-omap2/board-omap3beagle-camera.c | 12 ++++--------
9 1 files changed, 4 insertions(+), 8 deletions(-)
10
11diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
12index af8581a..20174a7 100644
13--- a/arch/arm/mach-omap2/board-omap3beagle-camera.c
14+++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
15@@ -54,8 +54,6 @@
16 static struct regulator *beagle_mt9t111_reg1;
17 static struct regulator *beagle_mt9t111_reg2;
18
19-static struct device *beaglecam_dev;
20-
21 #if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
22 static struct isp_interface_config mt9t111_if_config = {
23 .ccdc_par_ser = ISP_PARLL,
24@@ -216,14 +214,14 @@ static int beagle_cam_probe(struct platform_device *pdev)
25 {
26 int err;
27
28- beagle_mt9t111_reg1 = regulator_get(beaglecam_dev, "vaux3_1");
29+ beagle_mt9t111_reg1 = regulator_get(&pdev->dev, "vaux3_1");
30 if (IS_ERR(beagle_mt9t111_reg1)) {
31- dev_err(beaglecam_dev, "vaux3_1 regulator missing\n");
32+ dev_err(&pdev->dev, "vaux3_1 regulator missing\n");
33 return PTR_ERR(beagle_mt9t111_reg1);
34 }
35- beagle_mt9t111_reg2 = regulator_get(beaglecam_dev, "vaux4_1");
36+ beagle_mt9t111_reg2 = regulator_get(&pdev->dev, "vaux4_1");
37 if (IS_ERR(beagle_mt9t111_reg2)) {
38- dev_err(beaglecam_dev, "vaux4_1 regulator missing\n");
39+ dev_err(&pdev->dev, "vaux4_1 regulator missing\n");
40 regulator_put(beagle_mt9t111_reg1);
41 return PTR_ERR(beagle_mt9t111_reg2);
42 }
43@@ -243,8 +241,6 @@ static int beagle_cam_probe(struct platform_device *pdev)
44 }
45 #endif
46
47- beaglecam_dev = &pdev->dev;
48-
49 printk(KERN_INFO MODULE_NAME ": Driver registration complete \n");
50
51 return 0;
52--
531.6.6.1
54