Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1858c99d authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] soc-camera: Don't fail at module init time if no device is present 



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: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent a1acb8f9

drivers/media/video/soc_camera.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -1518,6 +1518,7 @@ static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev) 
}

}





static struct platform_driver __refdata soc_camera_pdrv = {

static struct platform_driver __refdata soc_camera_pdrv = {

	.probe = soc_camera_pdrv_probe,

	.remove  = __devexit_p(soc_camera_pdrv_remove),

	.remove  = __devexit_p(soc_camera_pdrv_remove),

	.driver  = {

	.driver  = {

		.name	= "soc-camera-pdrv",

		.name	= "soc-camera-pdrv",
@@ -1527,7 +1528,7 @@ static struct platform_driver __refdata soc_camera_pdrv = { 




static int __init soc_camera_init(void)

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)

static void __exit soc_camera_exit(void)