diff options
Diffstat (limited to 'drivers/devfreq/devfreq.c')
| -rw-r--r-- | drivers/devfreq/devfreq.c | 17 | 
1 files changed, 11 insertions, 6 deletions
| diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index bf3ea7603a58..47206a21bb90 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -593,11 +593,16 @@ struct devfreq *devfreq_add_device(struct device *dev,  	list_add(&devfreq->node, &devfreq_list);  	governor = find_devfreq_governor(devfreq->governor_name); -	if (!IS_ERR(governor)) -		devfreq->governor = governor; -	if (devfreq->governor) -		err = devfreq->governor->event_handler(devfreq, -					DEVFREQ_GOV_START, NULL); +	if (IS_ERR(governor)) { +		dev_err(dev, "%s: Unable to find governor for the device\n", +			__func__); +		err = PTR_ERR(governor); +		goto err_init; +	} + +	devfreq->governor = governor; +	err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START, +						NULL);  	if (err) {  		dev_err(dev, "%s: Unable to start governor for the device\n",  			__func__); @@ -850,7 +855,7 @@ err_out:  EXPORT_SYMBOL(devfreq_add_governor);  /** - * devfreq_remove_device() - Remove devfreq feature from a device. + * devfreq_remove_governor() - Remove devfreq feature from a device.   * @governor:	the devfreq governor to be removed   */  int devfreq_remove_governor(struct devfreq_governor *governor) |