cpufreq: propagate error returned by kobject_move()
We are returning -EINVAL instead of the error returned from kobject_move() when it fails. Propagate the actual error number. Also add a meaningful print when sysfs_create_link() fails. Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
		
					parent
					
						
							
								1461dc7d1c
							
						
					
				
			
			
				commit
				
					
						41dfd908fc
					
				
			
		
					 1 changed files with 5 additions and 3 deletions
				
			
		| 
						 | 
					@ -1322,10 +1322,12 @@ static int cpufreq_nominate_new_policy_cpu(struct cpufreq_policy *policy,
 | 
				
			||||||
	ret = kobject_move(&policy->kobj, &cpu_dev->kobj);
 | 
						ret = kobject_move(&policy->kobj, &cpu_dev->kobj);
 | 
				
			||||||
	if (ret) {
 | 
						if (ret) {
 | 
				
			||||||
		pr_err("%s: Failed to move kobj: %d\n", __func__, ret);
 | 
							pr_err("%s: Failed to move kobj: %d\n", __func__, ret);
 | 
				
			||||||
		ret = sysfs_create_link(&cpu_dev->kobj, &policy->kobj,
 | 
					 | 
				
			||||||
					"cpufreq");
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
		return -EINVAL;
 | 
							if (sysfs_create_link(&cpu_dev->kobj, &policy->kobj, "cpufreq"))
 | 
				
			||||||
 | 
								pr_err("%s: Failed to restore kobj link to cpu:%d\n",
 | 
				
			||||||
 | 
								       __func__, cpu_dev->id);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
							return ret;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return cpu_dev->id;
 | 
						return cpu_dev->id;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue