---

yaml --- r: 320623 b: refs/heads/master c: 1858c99 h: refs/heads/master i: 320621: 73d73a9 320619: 8aa022b 320615: a1cd1fc 320607: c02051b v: v3
git-mirror · Jul 30, 2012 · 66c4458 · 66c4458
1 parent 51bf271
commit 66c4458
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1acb8f9a088193a66b4d176f5b9a7fb10356ae7
+refs/heads/master: 1858c99db41eec26bb33e6b67020a41705e83faf
diff --git a/trunk/drivers/media/video/soc_camera.c b/trunk/drivers/media/video/soc_camera.c
@@ -1518,6 +1518,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
 }
 
 static struct platform_driver __refdata soc_camera_pdrv = {
+	.probe = soc_camera_pdrv_probe,
 	.remove  = __devexit_p(soc_camera_pdrv_remove),
 	.driver  = {
 		.name	= "soc-camera-pdrv",
@@ -1527,7 +1528,7 @@ static struct platform_driver __refdata soc_camera_pdrv = {
 
 static int __init soc_camera_init(void)
 {
-	return platform_driver_probe(&soc_camera_pdrv, soc_camera_pdrv_probe);
+	return platform_driver_register(&soc_camera_pdrv);
 }
 
 static void __exit soc_camera_exit(void)