Browse Source

gpio: davinci: Handle return value of clk_prepare_enable

clk_prepare_enable() can fail here and we must check its return value.

Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Arvind Yadav 8 years ago
parent
commit
6dc0048cff
1 changed files with 9 additions and 2 deletions
  1. 9 2
      drivers/gpio/gpio-davinci.c

+ 9 - 2
drivers/gpio/gpio-davinci.c

@@ -437,6 +437,7 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
 {
 {
 	unsigned	gpio, bank;
 	unsigned	gpio, bank;
 	int		irq;
 	int		irq;
+	int		ret;
 	struct clk	*clk;
 	struct clk	*clk;
 	u32		binten = 0;
 	u32		binten = 0;
 	unsigned	ngpio, bank_irq;
 	unsigned	ngpio, bank_irq;
@@ -480,12 +481,15 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
 		       PTR_ERR(clk));
 		       PTR_ERR(clk));
 		return PTR_ERR(clk);
 		return PTR_ERR(clk);
 	}
 	}
-	clk_prepare_enable(clk);
+	ret = clk_prepare_enable(clk);
+	if (ret)
+		return ret;
 
 
 	if (!pdata->gpio_unbanked) {
 	if (!pdata->gpio_unbanked) {
 		irq = devm_irq_alloc_descs(dev, -1, 0, ngpio, 0);
 		irq = devm_irq_alloc_descs(dev, -1, 0, ngpio, 0);
 		if (irq < 0) {
 		if (irq < 0) {
 			dev_err(dev, "Couldn't allocate IRQ numbers\n");
 			dev_err(dev, "Couldn't allocate IRQ numbers\n");
+			clk_disable_unprepare(clk);
 			return irq;
 			return irq;
 		}
 		}
 
 
@@ -494,6 +498,7 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
 							chips);
 							chips);
 		if (!irq_domain) {
 		if (!irq_domain) {
 			dev_err(dev, "Couldn't register an IRQ domain\n");
 			dev_err(dev, "Couldn't register an IRQ domain\n");
+			clk_disable_unprepare(clk);
 			return -ENODEV;
 			return -ENODEV;
 		}
 		}
 	}
 	}
@@ -562,8 +567,10 @@ static int davinci_gpio_irq_setup(struct platform_device *pdev)
 				       sizeof(struct
 				       sizeof(struct
 					      davinci_gpio_irq_data),
 					      davinci_gpio_irq_data),
 					      GFP_KERNEL);
 					      GFP_KERNEL);
-		if (!irqdata)
+		if (!irqdata) {
+			clk_disable_unprepare(clk);
 			return -ENOMEM;
 			return -ENOMEM;
+		}
 
 
 		irqdata->regs = g;
 		irqdata->regs = g;
 		irqdata->bank_num = bank;
 		irqdata->bank_num = bank;