Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 527b570c authored by Vasily Khoruzhick's avatar Vasily Khoruzhick Committed by Felipe Balbi
Browse files

usb: gadget: s3c2410: Move to clk_prepare_enable/clk_disable_unprepare 



Use clk_prepare_enable/clk_disable_unprepare to make the driver
work properly with common clock framework.

Signed-off-by: default avatarVasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 50aea6fc

drivers/usb/gadget/s3c2410_udc.c

+4 −4
Original line number Diff line number Diff line
@@ -1788,7 +1788,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) 
		return PTR_ERR(usb_bus_clock);

	}



	clk_enable(usb_bus_clock);

	clk_prepare_enable(usb_bus_clock);



	udc_clock = clk_get(NULL, "usb-device");

	if (IS_ERR(udc_clock)) {
@@ -1796,7 +1796,7 @@ static int s3c2410_udc_probe(struct platform_device *pdev) 
		return PTR_ERR(udc_clock);

	}



	clk_enable(udc_clock);

	clk_prepare_enable(udc_clock);



	mdelay(10);
@@ -1952,13 +1952,13 @@ static int s3c2410_udc_remove(struct platform_device *pdev) 
	release_mem_region(rsrc_start, rsrc_len);



	if (!IS_ERR(udc_clock) && udc_clock != NULL) {

		clk_disable(udc_clock);

		clk_disable_unprepare(udc_clock);

		clk_put(udc_clock);

		udc_clock = NULL;

	}



	if (!IS_ERR(usb_bus_clock) && usb_bus_clock != NULL) {

		clk_disable(usb_bus_clock);

		clk_disable_unprepare(usb_bus_clock);

		clk_put(usb_bus_clock);

		usb_bus_clock = NULL;

	}