Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

[~andy/linux] / drivers / video / bf537-lq035.c

diff --git a/drivers/video/bf537-lq035.c b/drivers/video/bf537-lq035.c
index bea53c1a4950143d149a6694334dc8606f37fdd0..befbc80d11fca4d82c4718a7cc47b580003db3b9 100644 (file)
--- a/drivers/video/bf537-lq035.c
+++ b/drivers/video/bf537-lq035.c
@@ -383,23 +383,19 @@ static int __devinit request_ports(void)
        }
 
 #if (defined(UD) && defined(LBR))
-       if (gpio_request(UD, KBUILD_MODNAME)) {
+       if (gpio_request_one(UD, GPIOF_OUT_INIT_LOW, KBUILD_MODNAME)) {
                pr_err("requesting GPIO %d failed\n", UD);
                return -EBUSY;
        }
 
-       if (gpio_request(LBR, KBUILD_MODNAME)) {
+       if (gpio_request_one(LBR, GPIOF_OUT_INIT_HIGH, KBUILD_MODNAME)) {
                pr_err("requesting GPIO %d failed\n", LBR);
                gpio_free(UD);
                return -EBUSY;
        }
-
-       gpio_direction_output(UD, 0);
-       gpio_direction_output(LBR, 1);
-
 #endif
 
-       if (gpio_request(MOD, KBUILD_MODNAME)) {
+       if (gpio_request_one(MOD, GPIOF_OUT_INIT_HIGH, KBUILD_MODNAME)) {
                pr_err("requesting GPIO %d failed\n", MOD);
 #if (defined(UD) && defined(LBR))
                gpio_free(LBR);
@@ -408,8 +404,6 @@ static int __devinit request_ports(void)
                return -EBUSY;
        }
 
-       gpio_direction_output(MOD, 1);
-
        SSYNC();
        return 0;
 }