commit caacc08f9ab04766f56a7f2c0a72372dc67d9ce8
author Linux Build Service Account <lnxbuild@localhost> Fri Dec 16 07:26:20 2011 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Fri Dec 16 07:26:21 2011 -0800
tree 94621ed027afe1ee0a581e449f12fb832066ee89
parent 2174f4a08e63931a0d9b53fc0e406dc608b8f39a
parent 54321bb27bf237c442ed27f6df1b120f1f7ca7cf

Merge "msm: audio: qdsp6v2: Fix warning prints at gpio call." into msm-3.0

arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c

diff --git a/arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c b/arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c
index 11687ac..51a209d 100644
--- a/arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c
+++ b/arch/arm/mach-msm/qdsp6v2/board-msm8x60-audio.c
@@ -315,10 +315,10 @@
 		}
 
 		gpio_direction_output(SNDDEV_GPIO_CLASS_D1_EN, 1);
-		gpio_set_value(SNDDEV_GPIO_CLASS_D1_EN, 1);
+		gpio_set_value_cansleep(SNDDEV_GPIO_CLASS_D1_EN, 1);
 
 	} else {
-		gpio_set_value(SNDDEV_GPIO_CLASS_D1_EN, 0);
+		gpio_set_value_cansleep(SNDDEV_GPIO_CLASS_D1_EN, 0);
 		gpio_free(SNDDEV_GPIO_CLASS_D1_EN);
 	}
 	return 0;