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

Commit f44a0682 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "clk: msm: clock: Fix uninitialized variable in clock code"

parents c6702d5d fe3f8f5b

drivers/clk/msm/clock-cpu-8939.c

+2 −2
Original line number Diff line number Diff line
@@ -578,9 +578,9 @@ static void populate_opp_table(struct platform_device *pdev, 
					bool single_cluster)

{

	struct platform_device *apc0_dev, *apc1_dev;

	struct device_node *apc0_node, *apc1_node;

	struct device_node *apc0_node = NULL, *apc1_node;

	unsigned long apc0_fmax, apc1_fmax;

	int cpu, a53_c0_cpu, a53_c1_cpu;

	int cpu, a53_c0_cpu = 0, a53_c1_cpu = 0;



	if (!single_cluster)

		apc0_node = of_parse_phandle(pdev->dev.of_node,

drivers/clk/msm/clock-cpu-8953.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static void print_opp_table(int a53_pwr_cpu, int a53_perf_cpu) 
static void populate_opp_table(struct platform_device *pdev)

{

	unsigned long apc0_fmax;

	int cpu, a53_pwr_cpu, a53_perf_cpu;

	int cpu, a53_pwr_cpu = 0, a53_perf_cpu = 0;



	apc0_fmax = a53_pwr_clk.c.fmax[a53_pwr_clk.c.num_fmax - 1];

drivers/clk/msm/clock.c

+2 −2
Original line number Diff line number Diff line 
/* arch/arm/mach-msm/clock.c

 *

 * Copyright (C) 2007 Google, Inc.

 * Copyright (c) 2007-2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2007-2016, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -1173,7 +1173,7 @@ static void populate_clock_opp_table(struct device_node *np, 
	char clk_handle_name[MAX_LEN_OPP_HANDLE];

	char clk_store_volt_corner[MAX_LEN_OPP_HANDLE];

	size_t i;

	int n, len, count, uv;

	int n, len, count, uv = 0;

	unsigned long rate, ret = 0;

	bool store_vcorner;