Merge branch 'process_vm' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

[karo-tx-linux.git] / arch / arm / mach-pxa / pcm990-baseboard.c

diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 9a9c539f6c015b51b2c6eb45a5c483786b12338e..6d38c6548b3d4ba0c6dcc0471819fca0ab7b9ee5 100644 (file)
--- 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;
 }