From fed8f16050f69132e591d5d65caffe0d0c7c7a14 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Mon, 3 Sep 2012 16:15:18 +0530 Subject: [PATCH] --- yaml --- r: 325897 b: refs/heads/master c: 84749c6dcb694a7aa793221ea8cc3d70bd46d466 h: refs/heads/master i: 325895: 909ee11507ee088fba654189f4c38fd6e992c368 v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a2857cd92771..7172514ed786 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc2cdcaf4caafeb069d01704fdfda24f9c1f443a +refs/heads/master: 84749c6dcb694a7aa793221ea8cc3d70bd46d466 diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c index a826cb98d306..5b90a3c159e6 100644 --- a/trunk/drivers/usb/gadget/s3c-hsotg.c +++ b/trunk/drivers/usb/gadget/s3c-hsotg.c @@ -3516,7 +3516,7 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev) hsotg->dev = dev; hsotg->plat = plat; - hsotg->clk = clk_get(&pdev->dev, "otg"); + hsotg->clk = devm_clk_get(&pdev->dev, "otg"); if (IS_ERR(hsotg->clk)) { dev_err(dev, "cannot get otg clock\n"); return PTR_ERR(hsotg->clk); @@ -3664,7 +3664,6 @@ static int __devinit s3c_hsotg_probe(struct platform_device *pdev) err_clk: clk_disable_unprepare(hsotg->clk); - clk_put(hsotg->clk); return ret; } @@ -3690,7 +3689,6 @@ static int __devexit s3c_hsotg_remove(struct platform_device *pdev) regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); clk_disable_unprepare(hsotg->clk); - clk_put(hsotg->clk); device_unregister(&hsotg->gadget.dev); return 0;