diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2014-03-12 16:06:34 +0100 |
| commit | d25f27034e1e3ca1f86c3e748ce0f565f13bff7f (patch) | |
| tree | 9914ad9ce84d779ee83326d109ebed034523ea5e /drivers/media/video/tegra/sh532u.c | |
| parent | 56db5e2dc402ec8dd7ba922ec5ae1b450ed95d43 (diff) | |
| parent | 82685ba23c803d10f678f25e92ca62aa575d24d9 (diff) | |
Merge branch 'l4t/l4t-r16-r2' into colibri
Conflicts:
drivers/media/video/tegra_v4l2_camera.c
reverted to current driver supporting ACM rather than CSI2
drivers/media/video/videobuf2-dma-nvmap.c
drivers/video/tegra/host/Makefile
Diffstat (limited to 'drivers/media/video/tegra/sh532u.c')
| -rw-r--r-- | drivers/media/video/tegra/sh532u.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/tegra/sh532u.c b/drivers/media/video/tegra/sh532u.c index e41dd1f4afb1..b9f9b91d5a45 100644 --- a/drivers/media/video/tegra/sh532u.c +++ b/drivers/media/video/tegra/sh532u.c @@ -1,7 +1,7 @@ /* * SH532U focuser driver. * - * Copyright (C) 2011-2012 NVIDIA Corporation. + * Copyright (C) 2011-2013 NVIDIA Corporation. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -386,7 +386,7 @@ static void sh532u_gpio_exit(struct sh532u_info *info) { unsigned i; - for (i = 0; i <= ARRAY_SIZE(sh532u_gpios); i++) { + for (i = 0; i < ARRAY_SIZE(sh532u_gpios); i++) { if (info->gpio[i].flag && info->gpio[i].own) { gpio_free(info->gpio[i].gpio); info->gpio[i].own = false; |