diff options
Diffstat (limited to 'drivers/video/msm/mddi_client_toshiba.c')
-rw-r--r-- | drivers/video/msm/mddi_client_toshiba.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/video/msm/mddi_client_toshiba.c b/drivers/video/msm/mddi_client_toshiba.c index f9bc932ac46b..053eb6877330 100644 --- a/drivers/video/msm/mddi_client_toshiba.c +++ b/drivers/video/msm/mddi_client_toshiba.c | |||
@@ -186,14 +186,10 @@ static int setup_vsync(struct panel_info *panel, | |||
186 | ret = 0; | 186 | ret = 0; |
187 | goto uninit; | 187 | goto uninit; |
188 | } | 188 | } |
189 | ret = gpio_request(gpio, "vsync"); | 189 | ret = gpio_request_one(gpio, GPIOF_IN, "vsync"); |
190 | if (ret) | 190 | if (ret) |
191 | goto err_request_gpio_failed; | 191 | goto err_request_gpio_failed; |
192 | 192 | ||
193 | ret = gpio_direction_input(gpio); | ||
194 | if (ret) | ||
195 | goto err_gpio_direction_input_failed; | ||
196 | |||
197 | ret = irq = gpio_to_irq(gpio); | 193 | ret = irq = gpio_to_irq(gpio); |
198 | if (ret < 0) | 194 | if (ret < 0) |
199 | goto err_get_irq_num_failed; | 195 | goto err_get_irq_num_failed; |
@@ -210,7 +206,6 @@ uninit: | |||
210 | free_irq(gpio_to_irq(gpio), panel); | 206 | free_irq(gpio_to_irq(gpio), panel); |
211 | err_request_irq_failed: | 207 | err_request_irq_failed: |
212 | err_get_irq_num_failed: | 208 | err_get_irq_num_failed: |
213 | err_gpio_direction_input_failed: | ||
214 | gpio_free(gpio); | 209 | gpio_free(gpio); |
215 | err_request_gpio_failed: | 210 | err_request_gpio_failed: |
216 | return ret; | 211 | return ret; |