Преглед изворни кода

usb:hsotg:samsung: err_irq: support for probe function

Missing handler for freeing requested IRQ added.
Moreover clk_ calls has been reorganized.

Signed-off-by: Lukasz Majewski <l.majewski@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Lukasz Majewski пре 13 година
родитељ
комит
1d144c6732
1 измењених фајлова са 5 додато и 8 уклоњено
  1. 5 8
      drivers/usb/gadget/s3c-hsotg.c

+ 5 - 8
drivers/usb/gadget/s3c-hsotg.c

@@ -3558,7 +3558,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
 				 hsotg->supplies);
 	if (ret) {
 		dev_err(dev, "failed to request supplies: %d\n", ret);
-		goto err_supplies;
+		goto err_irq;
 	}
 
 	ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies),
@@ -3637,17 +3637,13 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev)
 
 	return 0;
 
- err_ep_mem:
+err_ep_mem:
 	kfree(eps);
-
 err_supplies:
 	s3c_hsotg_phy_disable(hsotg);
-
 	regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
-
-	clk_disable_unprepare(hsotg->clk);
-	clk_put(hsotg->clk);
-
+err_irq:
+	free_irq(hsotg->irq, hsotg);
 err_regs:
 	iounmap(hsotg->regs);
 
@@ -3655,6 +3651,7 @@ err_regs_res:
 	release_resource(hsotg->regs_res);
 	kfree(hsotg->regs_res);
 err_clk:
+	clk_disable_unprepare(hsotg->clk);
 	clk_put(hsotg->clk);
 err_mem:
 	kfree(hsotg);