summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2011-07-27 11:11:41 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-03 18:27:41 -0200
commitfae00288c423330b7fd97df59fc90039b6399d93 (patch)
tree2e0bdd2fd8d8bd9edd92f9e9197e0e9d88aa6f21 /arch
parent7e5cf0ae269933dd951a9c1b746fb6bd569f1ac3 (diff)
downloadlinux-3.10-fae00288c423330b7fd97df59fc90039b6399d93.tar.gz
linux-3.10-fae00288c423330b7fd97df59fc90039b6399d93.tar.bz2
linux-3.10-fae00288c423330b7fd97df59fc90039b6399d93.zip
[media] ARM: PXA: use gpio_set_value_cansleep() on pcm990
Camera-switching GPIOs are provided by a i2c GPIO extender, switching them can send the caller to sleep. Use the GPIO API *_cansleep methods explicitly to avoid runtime warnings. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-pxa/pcm990-baseboard.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 9a9c539f6c0..6d38c6548b3 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -394,9 +394,9 @@ static int pcm990_camera_set_bus_param(struct soc_camera_link *link,
}
if (flags & SOCAM_DATAWIDTH_8)
- gpio_set_value(gpio_bus_switch, 1);
+ gpio_set_value_cansleep(gpio_bus_switch, 1);
else
- gpio_set_value(gpio_bus_switch, 0);
+ gpio_set_value_cansleep(gpio_bus_switch, 0);
return 0;
}