From 66c4458d75be0f1cde9de0f8b18f61aa29718d3b Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Wed, 18 Jul 2012 10:53:56 -0300 Subject: [PATCH] --- yaml --- r: 320623 b: refs/heads/master c: 1858c99db41eec26bb33e6b67020a41705e83faf h: refs/heads/master i: 320621: 73d73a923879ab08034436048e61123011ec3d70 320619: 8aa022b8c7a39e52278bbab69f790cff2c3cbd4e 320615: a1cd1fc7004b39ed5092ae3beed2e802d0d15365 320607: c02051b002d3ab92dea72a3952b2c68a13442eb5 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/soc_camera.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 258b3cfdf311..eed9b687721a 100644 --- 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 index 0421bf9453b4..e7c6809d1dbe 100644 --- 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)