]> Pileus Git - ~andy/linux/commitdiff
[media] soc-camera: Don't fail at module init time if no device is present
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Wed, 18 Jul 2012 13:53:56 +0000 (10:53 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Mon, 30 Jul 2012 22:13:39 +0000 (19:13 -0300)
The soc-camera module exports functions that are needed by soc-camera
client drivers even when not running in soc-camera mode. Replace the
platform_driver_probe() with a platform_driver_register() call to avoid
module load failures if no soc-camera device is present.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/soc_camera.c

index 0421bf9453b4f43d707168e5b8d4e97911401fb7..e7c6809d1dbe267e51717fb7776128673e87735e 100644 (file)
@@ -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)