From fe7f80d9397da2696fb07e8268693c6875a73dbc Mon Sep 17 00:00:00 2001 From: Daniel Morsing Date: Tue, 21 Dec 2010 10:23:13 +0000 Subject: [PATCH] --- yaml --- r: 226575 b: refs/heads/master c: d858addf10a00e663e438d7607f18496d30f1d1b h: refs/heads/master i: 226573: 0c3f7f3650b71407e107655b6b7a4c4122b6631e 226571: 362f391e074d84a141843ea11e84db04e617f98e 226567: 6436234ce770d447b707896c936d397ad96cba08 226559: 8adc91548acf7b856b969618ac01f397de7cee36 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-omap2/board-devkit8000.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0b1367bbced1..7f5ecd634927 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9e7683bbca638967a56e5d7fd4035a947109621 +refs/heads/master: d858addf10a00e663e438d7607f18496d30f1d1b diff --git a/trunk/arch/arm/mach-omap2/board-devkit8000.c b/trunk/arch/arm/mach-omap2/board-devkit8000.c index a30a7fce8cbf..7392c67ce109 100644 --- a/trunk/arch/arm/mach-omap2/board-devkit8000.c +++ b/trunk/arch/arm/mach-omap2/board-devkit8000.c @@ -118,27 +118,27 @@ static int devkit8000_panel_enable_lcd(struct omap_dss_device *dssdev) twl_i2c_write_u8(TWL4030_MODULE_LED, 0x0, 0x0); if (gpio_is_valid(dssdev->reset_gpio)) - gpio_set_value(dssdev->reset_gpio, 1); + gpio_set_value_cansleep(dssdev->reset_gpio, 1); return 0; } static void devkit8000_panel_disable_lcd(struct omap_dss_device *dssdev) { if (gpio_is_valid(dssdev->reset_gpio)) - gpio_set_value(dssdev->reset_gpio, 0); + gpio_set_value_cansleep(dssdev->reset_gpio, 0); } static int devkit8000_panel_enable_dvi(struct omap_dss_device *dssdev) { if (gpio_is_valid(dssdev->reset_gpio)) - gpio_set_value(dssdev->reset_gpio, 1); + gpio_set_value_cansleep(dssdev->reset_gpio, 1); return 0; } static void devkit8000_panel_disable_dvi(struct omap_dss_device *dssdev) { if (gpio_is_valid(dssdev->reset_gpio)) - gpio_set_value(dssdev->reset_gpio, 0); + gpio_set_value_cansleep(dssdev->reset_gpio, 0); } static struct regulator_consumer_supply devkit8000_vmmc1_supply =