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

Commit 6df609b2 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'pm-qos' and 'pm-devfreq' 

* pm-qos:
  PM / QoS: return -EINVAL for bogus strings

* pm-devfreq:
  PM / devfreq: constify attribute_group structures.
  PM / devfreq: tegra: fix error return code in tegra_devfreq_probe()
  PM / devfreq: rk3399_dmc: fix error return code in rk3399_dmcfreq_probe()
parents a252c258 2ca30331 20dd95ef

drivers/base/power/sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -272,6 +272,8 @@ static ssize_t pm_qos_latency_tolerance_store(struct device *dev, 
			value = PM_QOS_LATENCY_TOLERANCE_NO_CONSTRAINT;

		else if (!strcmp(buf, "any") || !strcmp(buf, "any\n"))

			value = PM_QOS_LATENCY_ANY;

		else

			return -EINVAL;

	}

	ret = dev_pm_qos_update_user_latency_tolerance(dev, value);

	return ret < 0 ? ret : n;

drivers/devfreq/governor_userspace.c

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ static struct attribute *dev_entries[] = { 
	&dev_attr_set_freq.attr,

	NULL,

};

static struct attribute_group dev_attr_group = {

static const struct attribute_group dev_attr_group = {

	.name	= "userspace",

	.attrs	= dev_entries,

};

drivers/devfreq/rk3399_dmc.c

+3 −2
Original line number Diff line number Diff line
@@ -336,8 +336,9 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) 


	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "Cannot get the dmc interrupt resource\n");

		return -EINVAL;

		dev_err(&pdev->dev,

			"Cannot get the dmc interrupt resource: %d\n", irq);

		return irq;

	}

	data = devm_kzalloc(dev, sizeof(struct rk3399_dmcfreq), GFP_KERNEL);

	if (!data)

drivers/devfreq/tegra-devfreq.c

+3 −3
Original line number Diff line number Diff line
@@ -688,9 +688,9 @@ static int tegra_devfreq_probe(struct platform_device *pdev) 
	}



	irq = platform_get_irq(pdev, 0);

	if (irq <= 0) {

		dev_err(&pdev->dev, "Failed to get IRQ\n");

		return -ENODEV;

	if (irq < 0) {

		dev_err(&pdev->dev, "Failed to get IRQ: %d\n", irq);

		return irq;

	}



	platform_set_drvdata(pdev, tegra);