summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorRobby Cai <r63905@freescale.com>2015-06-09 17:52:36 +0800
committerNitin Garg <nitin.garg@freescale.com>2015-09-17 09:23:37 -0500
commit3e66bbe7c9603dd7bb5b3a102d3b45951baff5eb (patch)
treed64e931f94e2615b5e7ef550a10e00a39125cc31 /drivers/media
parentcaf158dcfe676bf2e0e26c5499f3952e361688c5 (diff)
MLK-10795-5 camera: use gpio_set_value_cansleep instead of gpio_set_value
The reason is in spi gpio driver (drivers/gpio/gpio-74x164.c) the 'can_sleep' property is set true as follows. chip->gpio_chip.can_sleep = true; Then gpio_set_value() calls gpiod_set_raw_value(), in which it checkes 'can_sleep' property. WARN_ON(desc->chip->can_sleep); Use gpio_set_value_cansleep instead to avoid the kernel warning message. Signed-off-by: Robby Cai <r63905@freescale.com>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/mxc/subdev/ov5640.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/platform/mxc/subdev/ov5640.c b/drivers/media/platform/mxc/subdev/ov5640.c
index 9da985f3e3d7..bfa1371043ca 100644
--- a/drivers/media/platform/mxc/subdev/ov5640.c
+++ b/drivers/media/platform/mxc/subdev/ov5640.c
@@ -637,7 +637,7 @@ static const struct ov5640_datafmt
static inline void ov5640_power_down(int enable)
{
- gpio_set_value(pwn_gpio, enable);
+ gpio_set_value_cansleep(pwn_gpio, enable);
msleep(2);
}
@@ -645,18 +645,18 @@ static inline void ov5640_power_down(int enable)
static inline void ov5640_reset(void)
{
/* camera reset */
- gpio_set_value(rst_gpio, 1);
+ gpio_set_value_cansleep(rst_gpio, 1);
/* camera power down */
- gpio_set_value(pwn_gpio, 1);
+ gpio_set_value_cansleep(pwn_gpio, 1);
msleep(5);
- gpio_set_value(pwn_gpio, 0);
+ gpio_set_value_cansleep(pwn_gpio, 0);
msleep(5);
- gpio_set_value(rst_gpio, 0);
+ gpio_set_value_cansleep(rst_gpio, 0);
msleep(1);
- gpio_set_value(rst_gpio, 1);
+ gpio_set_value_cansleep(rst_gpio, 1);
msleep(5);
- gpio_set_value(pwn_gpio, 1);
+ gpio_set_value_cansleep(pwn_gpio, 1);
}
static int ov5640_regulator_enable(struct device *dev)