diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/devfreq/event/exynos-nocp.c | 6 | ||||
| -rw-r--r-- | drivers/devfreq/event/exynos-ppmu.c | 8 |
2 files changed, 11 insertions, 3 deletions
diff --git a/drivers/devfreq/event/exynos-nocp.c b/drivers/devfreq/event/exynos-nocp.c index 5c3e7b11e8a6..f6e7956fc91a 100644 --- a/drivers/devfreq/event/exynos-nocp.c +++ b/drivers/devfreq/event/exynos-nocp.c | |||
| @@ -267,7 +267,11 @@ static int exynos_nocp_probe(struct platform_device *pdev) | |||
| 267 | } | 267 | } |
| 268 | platform_set_drvdata(pdev, nocp); | 268 | platform_set_drvdata(pdev, nocp); |
| 269 | 269 | ||
| 270 | clk_prepare_enable(nocp->clk); | 270 | ret = clk_prepare_enable(nocp->clk); |
| 271 | if (ret) { | ||
| 272 | dev_err(&pdev->dev, "failed to prepare ppmu clock\n"); | ||
| 273 | return ret; | ||
| 274 | } | ||
| 271 | 275 | ||
| 272 | pr_info("exynos-nocp: new NoC Probe device registered: %s\n", | 276 | pr_info("exynos-nocp: new NoC Probe device registered: %s\n", |
| 273 | dev_name(dev)); | 277 | dev_name(dev)); |
diff --git a/drivers/devfreq/event/exynos-ppmu.c b/drivers/devfreq/event/exynos-ppmu.c index 9b7350935b73..d96e3dc71cf8 100644 --- a/drivers/devfreq/event/exynos-ppmu.c +++ b/drivers/devfreq/event/exynos-ppmu.c | |||
| @@ -44,7 +44,7 @@ struct exynos_ppmu { | |||
| 44 | { "ppmu-event2-"#name, PPMU_PMNCNT2 }, \ | 44 | { "ppmu-event2-"#name, PPMU_PMNCNT2 }, \ |
| 45 | { "ppmu-event3-"#name, PPMU_PMNCNT3 } | 45 | { "ppmu-event3-"#name, PPMU_PMNCNT3 } |
| 46 | 46 | ||
| 47 | struct __exynos_ppmu_events { | 47 | static struct __exynos_ppmu_events { |
| 48 | char *name; | 48 | char *name; |
| 49 | int id; | 49 | int id; |
| 50 | } ppmu_events[] = { | 50 | } ppmu_events[] = { |
| @@ -648,7 +648,11 @@ static int exynos_ppmu_probe(struct platform_device *pdev) | |||
| 648 | dev_name(&pdev->dev), desc[i].name); | 648 | dev_name(&pdev->dev), desc[i].name); |
| 649 | } | 649 | } |
| 650 | 650 | ||
| 651 | clk_prepare_enable(info->ppmu.clk); | 651 | ret = clk_prepare_enable(info->ppmu.clk); |
| 652 | if (ret) { | ||
| 653 | dev_err(&pdev->dev, "failed to prepare ppmu clock\n"); | ||
| 654 | return ret; | ||
| 655 | } | ||
| 652 | 656 | ||
| 653 | return 0; | 657 | return 0; |
| 654 | } | 658 | } |
