Merge "msm: rpm-regulator-smd: remove incorrect rpm_regulator_get() unlock calls" (2d72a5ed) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mach-msm/rpm-regulator-smd.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -932,7 +932,6 @@ struct rpm_regulator rpm_regulator_get(struct device dev, const char *supply)
		if (priv_reg == NULL) {
		vreg_err(framework_reg, "could not allocate memory for "
		"regulator\n");
		rpm_vreg_unlock(rpm_vreg);
		return ERR_PTR(-ENOMEM);
		}

		@@ -945,7 +944,6 @@ struct rpm_regulator rpm_regulator_get(struct device dev, const char *supply)
		vreg_err(framework_reg, "could not allocate memory for "
		"regulator_dev\n");
		kfree(priv_reg);
		rpm_vreg_unlock(rpm_vreg);
		return ERR_PTR(-ENOMEM);
		}
		priv_reg->rdev->reg_data = priv_reg;