summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorJosh Wu <josh.wu@atmel.com>2014-07-25 07:13:38 -0300
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-30 19:35:06 -0300
commit3900623bfaffde4eeb93ca0ba0475598a1b0cef5 (patch)
tree88dcae1db1cb0921a3bcf3812f5f0eef2e6d8295 /drivers/media
parent47c71bd61b772cd72159dff4aae43734257a485a (diff)
downloadop-kernel-dev-3900623bfaffde4eeb93ca0ba0475598a1b0cef5.zip
op-kernel-dev-3900623bfaffde4eeb93ca0ba0475598a1b0cef5.tar.gz
[media] media: atmel-isi: add v4l2 async probe support
Signed-off-by: Josh Wu <josh.wu@atmel.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/soc_camera/atmel-isi.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c
index 38c723a..c0d4612 100644
--- a/drivers/media/platform/soc_camera/atmel-isi.c
+++ b/drivers/media/platform/soc_camera/atmel-isi.c
@@ -980,6 +980,11 @@ static int atmel_isi_probe(struct platform_device *pdev)
soc_host->v4l2_dev.dev = &pdev->dev;
soc_host->nr = pdev->id;
+ if (isi->pdata.asd_sizes) {
+ soc_host->asd = isi->pdata.asd;
+ soc_host->asd_sizes = isi->pdata.asd_sizes;
+ }
+
ret = soc_camera_host_register(soc_host);
if (ret) {
dev_err(&pdev->dev, "Unable to register soc camera host\n");
OpenPOWER on IntegriCloud