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

Commit fa608dee authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "PM / devfreq: bw_hwmon: irq can be negative"

parents 5f9bd5ac 5495ae00

drivers/devfreq/bimc-bwmon.c

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

 * Copyright (c) 2014-2017, 2019, The Linux Foundation. All rights reserved.

 */



#define pr_fmt(fmt) "bimc-bwmon: " fmt
@@ -57,7 +57,7 @@ struct bwmon { 
	void __iomem *base;

	void __iomem *global_base;

	unsigned int mport;

	unsigned int irq;

	int irq;

	const struct bwmon_spec *spec;

	struct device *dev;

	struct bw_hwmon hw;

drivers/devfreq/devfreq.c

+12 −3
Original line number Diff line number Diff line
@@ -984,7 +984,7 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, 
	struct devfreq *df = to_devfreq(dev);

	int ret;

	char str_governor[DEVFREQ_NAME_LEN + 1];

	struct devfreq_governor *governor;

	const struct devfreq_governor *governor, *prev_gov;



	ret = sscanf(buf, "%" __stringify(DEVFREQ_NAME_LEN) "s", str_governor);

	if (ret != 1)
@@ -1013,12 +1013,21 @@ static ssize_t governor_store(struct device *dev, struct device_attribute *attr, 
			goto out;

		}

	}

	prev_gov = df->governor;

	df->governor = governor;

	strncpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN);

	strlcpy(df->governor_name, governor->name, DEVFREQ_NAME_LEN);

	ret = df->governor->event_handler(df, DEVFREQ_GOV_START, NULL);

	if (ret)

	if (ret) {

		dev_warn(dev, "%s: Governor %s not started(%d)\n",

			 __func__, df->governor->name, ret);

		if (prev_gov) {

			df->governor = prev_gov;

			strlcpy(df->governor_name, prev_gov->name,

				DEVFREQ_NAME_LEN);

			df->governor->event_handler(df, DEVFREQ_GOV_START,

						    NULL);

		}

	}

out:

	mutex_unlock(&devfreq_list_lock);