summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Lilliebjerg <elilliebjerg@nvidia.com>2011-12-01 02:42:14 -0700
committerVarun Wadekar <vwadekar@nvidia.com>2011-12-08 17:54:17 +0530
commita313eda68445caa15533156a83a35d7999cc9801 (patch)
treeee5cf71649b7938f5600c2c45696012f6b5745cd
parentc74d0e2274e1e041e925a4edef0ab0522049bd11 (diff)
media: video: tegra: sh532u focuser driver
The gpio_set_value calls are replaced with gpio_set_value_cansleep to remove the WARN_ON dumps. Bug 909165 Change-Id: Ie21db3864e2f4ac371bed1bd9a30d841e195b94a Signed-off-by: Erik Lilliebjerg <elilliebjerg@nvidia.com> Reviewed-on: http://git-master/r/67639 Reviewed-by: Sachin Nikam <snikam@nvidia.com>
-rw-r--r--drivers/media/video/tegra/sh532u.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/tegra/sh532u.c b/drivers/media/video/tegra/sh532u.c
index 5781621e6875..76f8e36fd323 100644
--- a/drivers/media/video/tegra/sh532u.c
+++ b/drivers/media/video/tegra/sh532u.c
@@ -298,16 +298,16 @@ static int sh532u_i2c_rd32(struct sh532u_info *info, u8 addr, u8 reg, u32 *val)
static void sh532u_gpio_en(struct sh532u_info *info, int val)
{
if (info->pdata->gpio_en)
- gpio_set_value(info->pdata->gpio_en, val);
+ gpio_set_value_cansleep(info->pdata->gpio_en, val);
}
static void sh532u_gpio_reset(struct sh532u_info *info, int val)
{
if (val) {
if (!info->gpio_flag_reset && info->pdata->gpio_reset) {
- gpio_set_value(info->pdata->gpio_reset, 0);
+ gpio_set_value_cansleep(info->pdata->gpio_reset, 0);
mdelay(1);
- gpio_set_value(info->pdata->gpio_reset, 1);
+ gpio_set_value_cansleep(info->pdata->gpio_reset, 1);
mdelay(10); /* delay for device startup */
info->gpio_flag_reset = 1;
}