Commit 7ee5fd12 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-opp' 

* pm-opp:
  opp: core: Check for pending links before reading required_opp pointers
parents 3c5a2722 1f8b66d9

drivers/opp/core.c

+4 −4
Original line number Diff line number Diff line
@@ -893,6 +893,10 @@ static int _set_required_opps(struct device *dev, 
	if (!required_opp_tables)

		return 0;



	/* required-opps not fully initialized yet */

	if (lazy_linking_pending(opp_table))

		return -EBUSY;



	/*

	 * We only support genpd's OPPs in the "required-opps" for now, as we

	 * don't know much about other use cases. Error out if the required OPP
@@ -903,10 +907,6 @@ static int _set_required_opps(struct device *dev, 
		return -ENOENT;

	}



	/* required-opps not fully initialized yet */

	if (lazy_linking_pending(opp_table))

		return -EBUSY;



	/* Single genpd case */

	if (!genpd_virt_devs)

		return _set_required_opp(dev, dev, opp, 0);