From 80f15effa664af2b854f0b8c4e6860b63ff86209 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Fri, 3 Jun 2011 19:50:47 +0200 Subject: [PATCH] --- yaml --- r: 253303 b: refs/heads/master c: 6bc129532176fcafb4202b73b3f431986391a362 h: refs/heads/master i: 253301: bf789f6ce8342d26832e38a9ac95622cc5df990e 253299: b5d3d632f59fbde62c2128f869125f87834e3bcf 253295: 1095c3d842299efb20034a86ba06b4c48fd49ed8 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c-hsudc.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dc1c28b8fef4..63170d6bb398 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6207b17ece4ea40c378233b1ddf2a7f4288419d +refs/heads/master: 6bc129532176fcafb4202b73b3f431986391a362 diff --git a/trunk/drivers/usb/gadget/s3c-hsudc.c b/trunk/drivers/usb/gadget/s3c-hsudc.c index 9a1b966e18db..d5e3e1e58626 100644 --- a/trunk/drivers/usb/gadget/s3c-hsudc.c +++ b/trunk/drivers/usb/gadget/s3c-hsudc.c @@ -1302,7 +1302,8 @@ static int s3c_hsudc_probe(struct platform_device *pdev) hsudc->uclk = clk_get(&pdev->dev, "usb-device"); if (IS_ERR(hsudc->uclk)) { dev_err(dev, "failed to find usb-device clock source\n"); - return PTR_ERR(hsudc->uclk); + ret = PTR_ERR(hsudc->uclk); + goto err_clk; } clk_enable(hsudc->uclk); @@ -1311,7 +1312,8 @@ static int s3c_hsudc_probe(struct platform_device *pdev) disable_irq(hsudc->irq); local_irq_enable(); return 0; - +err_clk: + free_irq(hsudc->irq, hsudc); err_irq: iounmap(hsudc->regs);