diff options
Diffstat (limited to 'drivers/gpio/gpio-pxa.c')
-rw-r--r-- | drivers/gpio/gpio-pxa.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpio/gpio-pxa.c b/drivers/gpio/gpio-pxa.c index 9cac88a65f78..528de0fa0c9e 100644 --- a/drivers/gpio/gpio-pxa.c +++ b/drivers/gpio/gpio-pxa.c | |||
@@ -620,19 +620,12 @@ static int __devinit pxa_gpio_probe(struct platform_device *pdev) | |||
620 | iounmap(gpio_reg_base); | 620 | iounmap(gpio_reg_base); |
621 | return PTR_ERR(clk); | 621 | return PTR_ERR(clk); |
622 | } | 622 | } |
623 | ret = clk_prepare(clk); | 623 | ret = clk_prepare_enable(clk); |
624 | if (ret) { | 624 | if (ret) { |
625 | clk_put(clk); | 625 | clk_put(clk); |
626 | iounmap(gpio_reg_base); | 626 | iounmap(gpio_reg_base); |
627 | return ret; | 627 | return ret; |
628 | } | 628 | } |
629 | ret = clk_enable(clk); | ||
630 | if (ret) { | ||
631 | clk_unprepare(clk); | ||
632 | clk_put(clk); | ||
633 | iounmap(gpio_reg_base); | ||
634 | return ret; | ||
635 | } | ||
636 | 629 | ||
637 | /* Initialize GPIO chips */ | 630 | /* Initialize GPIO chips */ |
638 | info = dev_get_platdata(&pdev->dev); | 631 | info = dev_get_platdata(&pdev->dev); |