From 7be465feffe436a59efa58f5c44390b3dab5c995 Mon Sep 17 00:00:00 2001 From: Chao Xie Date: Tue, 27 Nov 2012 22:06:02 -0500 Subject: [PATCH] --- yaml --- r: 348665 b: refs/heads/master c: e887786a466f36720fde5d4a1bc3c7dacd400bd1 h: refs/heads/master i: 348663: ea69664f624015fe3134c7c58333f54d4be4e6fb v: v3 --- [refs] | 2 +- trunk/drivers/usb/gadget/mv_udc_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9d0e322b0ad6..d956199f0e56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b33d74db39aae32e7d57265e25c94a488c42e37b +refs/heads/master: e887786a466f36720fde5d4a1bc3c7dacd400bd1 diff --git a/trunk/drivers/usb/gadget/mv_udc_core.c b/trunk/drivers/usb/gadget/mv_udc_core.c index 379aac7b82fc..6e8b1272ebce 100644 --- a/trunk/drivers/usb/gadget/mv_udc_core.c +++ b/trunk/drivers/usb/gadget/mv_udc_core.c @@ -1012,7 +1012,7 @@ static void udc_clock_enable(struct mv_udc *udc) unsigned int i; for (i = 0; i < udc->clknum; i++) - clk_enable(udc->clk[i]); + clk_prepare_enable(udc->clk[i]); } static void udc_clock_disable(struct mv_udc *udc) @@ -1020,7 +1020,7 @@ static void udc_clock_disable(struct mv_udc *udc) unsigned int i; for (i = 0; i < udc->clknum; i++) - clk_disable(udc->clk[i]); + clk_disable_unprepare(udc->clk[i]); } static void udc_stop(struct mv_udc *udc)