diff --git a/[refs] b/[refs]
index 9c0866543237..e005d3477614 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38f3daf678d909e8ee5638f21a34f35c01343420
+refs/heads/master: af461d64e11f81db4a7619dd574fe779ae3a0884
diff --git a/trunk/drivers/video/omap2/displays/panel-tfp410.c b/trunk/drivers/video/omap2/displays/panel-tfp410.c
index f03964e5b6ab..bff306e041ca 100644
--- a/trunk/drivers/video/omap2/displays/panel-tfp410.c
+++ b/trunk/drivers/video/omap2/displays/panel-tfp410.c
@@ -64,7 +64,7 @@ static int tfp410_power_on(struct omap_dss_device *dssdev)
 		goto err0;
 
 	if (gpio_is_valid(ddata->pd_gpio))
-		gpio_set_value(ddata->pd_gpio, 1);
+		gpio_set_value_cansleep(ddata->pd_gpio, 1);
 
 	return 0;
 err0:
@@ -79,7 +79,7 @@ static void tfp410_power_off(struct omap_dss_device *dssdev)
 		return;
 
 	if (gpio_is_valid(ddata->pd_gpio))
-		gpio_set_value(ddata->pd_gpio, 0);
+		gpio_set_value_cansleep(ddata->pd_gpio, 0);
 
 	omapdss_dpi_display_disable(dssdev);
 }