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

Commit 0fe30da2 authored by Dmitry Torokhov's avatar Dmitry Torokhov Committed by Rafael J. Wysocki
Browse files

PM / OPP: fix warning in of_free_opp_table() 



Not having OPP defined for a device is not a crime, we should not splat
warning in this case. Also, it seems that we are ready to accept invalid
dev (find_device_opp will return ERR_PTR(-EINVAL) then) so let's not
crash in dev_name() in such case.

Signed-off-by: default avatarDmitry Torokhov <dtor@chromium.org>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent b02ded24

drivers/base/power/opp.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -799,9 +799,15 @@ void of_free_opp_table(struct device *dev) 




	/* Check for existing list for 'dev' */

	/* Check for existing list for 'dev' */

	dev_opp = find_device_opp(dev);

	dev_opp = find_device_opp(dev);

	if (WARN(IS_ERR(dev_opp), "%s: dev_opp: %ld\n", dev_name(dev),

	if (IS_ERR(dev_opp)) {

		 PTR_ERR(dev_opp)))

		int error = PTR_ERR(dev_opp);

		if (error != -ENODEV)

			WARN(1, "%s: dev_opp: %d\n",

			     IS_ERR_OR_NULL(dev) ?

					"Invalid device" : dev_name(dev),

			     error);

		return;

		return;

	}





	/* Hold our list modification lock here */

	/* Hold our list modification lock here */

	mutex_lock(&dev_opp_list_lock);

	mutex_lock(&dev_opp_list_lock);