PM / OPP: fix incorrect OPP count handling in of_init_opp_table

In of_init_opp_table function, if a failure to add an OPP is
detected, the count of OPPs, yet to be added is not updated.
Fix this by decrementing this count on failure as well.

Signed-off-by: Chander Kashyap <k.chander@samsung.com>
Signed-off-by: Inderpal Singh <inderpal.s@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Merge branch 'acpi-tables' into bleeding-edge

* acpi-tables:
  ACPI: Fix conflict between customized DSDT and DSDT local copy
Merge branch 'pm-opp' into bleeding-edge

* pm-opp:
  PM / OPP: fix incorrect OPP count handling in of_init_opp_table
  PM / OPP: discard duplicate OPPs
  PM / OPP: Make OPP invisible to users in Kconfig