Skip to content

Commit

Permalink
[media] soc-camera: Don't fail at module init time if no device is pr…
Browse files Browse the repository at this point in the history
…esent

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>
  • Loading branch information
Laurent Pinchart authored and Mauro Carvalho Chehab committed Jul 30, 2012
1 parent a1acb8f commit 1858c99
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion drivers/media/video/soc_camera.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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)
Expand Down

0 comments on commit 1858c99

Please sign in to comment.