Merge branch 'pm-cpufreq'

rafaeljw · rafaeljw · commit 7bbe8f2a7e7e · 2020-10-02T18:30:30.000+02:00
* pm-cpufreq:
  cpufreq: intel_pstate: Fix missing return statement
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
@@ -2781,6 +2781,7 @@ static int intel_pstate_update_status(const char *buf, size_t size)
 
 		cpufreq_unregister_driver(intel_pstate_driver);
 		intel_pstate_driver_cleanup();
+		return 0;
 	}
 
 	if (size == 6 && !strncmp(buf, "active", size)) {

Original file line number	Diff line number	Diff line change
`@@ -2781,6 +2781,7 @@ static int intel_pstate_update_status(const char *buf, size_t size)`
`2781`	`2781`
`2782`	`2782`	`cpufreq_unregister_driver(intel_pstate_driver);`
`2783`	`2783`	`intel_pstate_driver_cleanup();`
	`2784`	`+ return 0;`
`2784`	`2785`	`}`
`2785`	`2786`
`2786`	`2787`	`if (size == 6 && !strncmp(buf, "active", size)) {`