github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 06:25:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

MALI Utgard: RK: only prepare clk_gpu not enable it in mali_probe()

Browse Source 
Change-Id: I53b2b9e0a277bedc4a15899ae680ed944219f7bf
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
This commit is contained in:
Zhen Chen 2017-12-05 11:19:06 +08:00 committed by Tao Huang
parent 711af44ea8
commit aaa43b14a5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c
View File

@ -588,9 +588,9 @@ static int mali_probe(struct platform_device *pdev)
mdev->clock = NULL;
/* Allow probe to continue without clock. */
} else {
err = clk_prepare_enable(mdev->clock);
err = clk_prepare(mdev->clock);
if (err) {
MALI_PRINT_ERROR(("Failed to prepare and enable clock (%d)\n", err));
MALI_PRINT_ERROR(("Failed to prepare clock (%d)\n", err));
goto clock_prepare_failed;
}
}
@ -640,7 +640,7 @@ static int mali_probe(struct platform_device *pdev)
devfreq_init_failed:
mali_pm_metrics_term(mdev);
pm_metrics_init_failed:
clk_disable_unprepare(mdev->clock);
clk_unprepare(mdev->clock);
clock_prepare_failed:
clk_put(mdev->clock);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) && defined(CONFIG_OF) \
@ -680,7 +680,7 @@ static int mali_remove(struct platform_device *pdev)
mali_pm_metrics_term(mdev);
if (mdev->clock) {
clk_disable_unprepare(mdev->clock);
clk_unprepare(mdev->clock);
clk_put(mdev->clock);
mdev->clock = NULL;
}