Merge "PM / devfreq: Fix NULL pointer dereference if freq_table is empty" (b440ef02) · Commits · e / devices / android_kernel_sony_msm8994

drivers/devfreq/devfreq.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -918,7 +918,7 @@ static ssize_t show_available_freqs(struct device *d,

		rcu_read_lock();
		use_opp = dev_pm_opp_get_opp_count(dev) > 0;
		do {
		while (use_opp \|\| (!use_opp && i < max_state)) {
		if (use_opp) {
		opp = dev_pm_opp_find_freq_ceil(dev, &freq);
		if (IS_ERR(opp))
		@@ -930,7 +930,7 @@ static ssize_t show_available_freqs(struct device *d,
		count += scnprintf(&buf[count], (PAGE_SIZE - count - 2),
		"%lu ", freq);
		freq++;
		} while (use_opp \|\| (!use_opp && i < max_state));
		}
		rcu_read_unlock();

		/* Truncate the trailing space */