From aeb6c5d361a498a61a87e5d23ad0ac86ed73bcf5 Mon Sep 17 00:00:00 2001 From: Ben Gardiner Date: Mon, 15 Nov 2010 09:42:52 -0500 Subject: [PATCH] --- yaml --- r: 225983 b: refs/heads/master c: 47e7cb148a12f6f825302a85cd2b78a0948be741 h: refs/heads/master i: 225981: 1ae573231b98781eee9829c4746152e98fe9d862 225979: d51afcd059e5803d6c255c12099679fea545452e 225975: a06f5f7728df1a81869c95e74889c92f7e51bbd7 225967: 07f48afa94564d1c6884c25be00ac1556a1b39aa 225951: 1f2af3de50ca526bfd10b99b04eabde4e69eeaab 225919: 03043f647004ed376a0fc21176af023b88d31c1b v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/board-da850-evm.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 2c6ebb86ea9e..558276c031b3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12cdd3d71954c2cd6dd556eec25dd7d346735831 +refs/heads/master: 47e7cb148a12f6f825302a85cd2b78a0948be741 diff --git a/trunk/arch/arm/mach-davinci/board-da850-evm.c b/trunk/arch/arm/mach-davinci/board-da850-evm.c index c6e11c682e4c..f89b0b7cb6f2 100644 --- a/trunk/arch/arm/mach-davinci/board-da850-evm.c +++ b/trunk/arch/arm/mach-davinci/board-da850-evm.c @@ -266,7 +266,7 @@ static inline void da850_evm_setup_emac_rmii(int rmii_sel) struct davinci_soc_info *soc_info = &davinci_soc_info; soc_info->emac_pdata->rmii_en = 1; - gpio_set_value(rmii_sel, 0); + gpio_set_value_cansleep(rmii_sel, 0); } #else static inline void da850_evm_setup_emac_rmii(int rmii_sel) { } @@ -325,9 +325,9 @@ static int da850_evm_ui_expander_teardown(struct i2c_client *client, unsigned gpio, unsigned ngpio, void *c) { /* deselect all functionalities */ - gpio_set_value(gpio + 5, 1); - gpio_set_value(gpio + 6, 1); - gpio_set_value(gpio + 7, 1); + gpio_set_value_cansleep(gpio + 5, 1); + gpio_set_value_cansleep(gpio + 6, 1); + gpio_set_value_cansleep(gpio + 7, 1); gpio_free(gpio + 5); gpio_free(gpio + 6);