diff options
| author | Josh Wu <josh.wu@atmel.com> | 2015-06-17 12:27:08 +0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2015-09-25 22:34:03 +0200 |
| commit | d67b48824fef61883404ed5c034901bbb319d0df (patch) | |
| tree | 49c4db6860934b62863bbfe4cc193fff071ee42f | |
| parent | [media] atmel-isi: Protect PM-only functions to kill warning (diff) | |
| download | linux-d67b48824fef61883404ed5c034901bbb319d0df.tar.xz linux-d67b48824fef61883404ed5c034901bbb319d0df.zip | |
[media] atmel-isi: increase timeout to disable/enable isi
If ISI is working on a 1024x768 or higher resolution, it needs longer
time to disable ISI. So this patch will increase timeout to 500ms.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
| -rw-r--r-- | drivers/media/platform/soc_camera/atmel-isi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/soc_camera/atmel-isi.c b/drivers/media/platform/soc_camera/atmel-isi.c index ccf30ccbe389..b018fa37f4df 100644 --- a/drivers/media/platform/soc_camera/atmel-isi.c +++ b/drivers/media/platform/soc_camera/atmel-isi.c @@ -225,7 +225,7 @@ static int atmel_isi_wait_status(struct atmel_isi *isi, int wait_reset) } timeout = wait_for_completion_timeout(&isi->complete, - msecs_to_jiffies(100)); + msecs_to_jiffies(500)); if (timeout == 0) return -ETIMEDOUT; |