From 7d8a3c9fb0f502a14658002f2f608f45afe5af65 Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Tue, 8 Jan 2013 14:27:00 +0530 Subject: [PATCH] --- yaml --- r: 354633 b: refs/heads/master c: cd76213eb57c505d3df6fa3134a6b3bb5394a90c h: refs/heads/master i: 354631: b32b0e5641bf41cbe3856491e00d01874a819c8a v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/s3c-hsotg.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 4758e5a7a0d0..655a9d0982ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 924d2532ab1897b034fa5477aea661732b91d748 +refs/heads/master: cd76213eb57c505d3df6fa3134a6b3bb5394a90c diff --git a/trunk/drivers/usb/gadget/s3c-hsotg.c b/trunk/drivers/usb/gadget/s3c-hsotg.c index 141971d9051e..833d85befa3f 100644 --- a/trunk/drivers/usb/gadget/s3c-hsotg.c +++ b/trunk/drivers/usb/gadget/s3c-hsotg.c @@ -3573,7 +3573,7 @@ static int s3c_hsotg_probe(struct platform_device *pdev) for (i = 0; i < ARRAY_SIZE(hsotg->supplies); i++) hsotg->supplies[i].supply = s3c_hsotg_supply_names[i]; - ret = regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies), + ret = devm_regulator_bulk_get(dev, ARRAY_SIZE(hsotg->supplies), hsotg->supplies); if (ret) { dev_err(dev, "failed to request supplies: %d\n", ret); @@ -3663,8 +3663,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev) kfree(eps); err_supplies: s3c_hsotg_phy_disable(hsotg); - regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); - err_clk: clk_disable_unprepare(hsotg->clk); @@ -3689,7 +3687,6 @@ static int s3c_hsotg_remove(struct platform_device *pdev) } s3c_hsotg_phy_disable(hsotg); - regulator_bulk_free(ARRAY_SIZE(hsotg->supplies), hsotg->supplies); clk_disable_unprepare(hsotg->clk);