aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/e750_wm9705.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa/e750_wm9705.c')
-rw-r--r--sound/soc/pxa/e750_wm9705.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/sound/soc/pxa/e750_wm9705.c b/sound/soc/pxa/e750_wm9705.c
index ce5f056009a7..55c53d13bea6 100644
--- a/sound/soc/pxa/e750_wm9705.c
+++ b/sound/soc/pxa/e750_wm9705.c
@@ -129,22 +129,16 @@ static int __init e750_init(void)
129 if (!machine_is_e750()) 129 if (!machine_is_e750())
130 return -ENODEV; 130 return -ENODEV;
131 131
132 ret = gpio_request(GPIO_E750_HP_AMP_OFF, "Headphone amp"); 132 ret = gpio_request_one(GPIO_E750_HP_AMP_OFF, GPIOF_OUT_INIT_HIGH,
133 "Headphone amp");
133 if (ret) 134 if (ret)
134 return ret; 135 return ret;
135 136
136 ret = gpio_request(GPIO_E750_SPK_AMP_OFF, "Speaker amp"); 137 ret = gpio_request_one(GPIO_E750_SPK_AMP_OFF, GPIOF_OUT_INIT_HIGH,
138 "Speaker amp");
137 if (ret) 139 if (ret)
138 goto free_hp_amp_gpio; 140 goto free_hp_amp_gpio;
139 141
140 ret = gpio_direction_output(GPIO_E750_HP_AMP_OFF, 1);
141 if (ret)
142 goto free_spk_amp_gpio;
143
144 ret = gpio_direction_output(GPIO_E750_SPK_AMP_OFF, 1);
145 if (ret)
146 goto free_spk_amp_gpio;
147
148 e750_snd_device = platform_device_alloc("soc-audio", -1); 142 e750_snd_device = platform_device_alloc("soc-audio", -1);
149 if (!e750_snd_device) { 143 if (!e750_snd_device) {
150 ret = -ENOMEM; 144 ret = -ENOMEM;