Merge "ASoC: msm8952: use devm_regulator_get to correct regulator ref" (da2a858f) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/msm/msm8952.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -2618,7 +2618,7 @@ int msm8952_init_wsa_switch_supply(struct platform_device *pdev,
		return -ENODEV;
		}

		pdata->wsa_switch_supply.supply = regulator_get(dev,
		pdata->wsa_switch_supply.supply = devm_regulator_get(dev,
		switch_supply_str);
		if (IS_ERR(pdata->wsa_switch_supply.supply)) {
		ret = PTR_ERR(pdata->wsa_switch_supply.supply);
		@@ -2641,7 +2641,6 @@ int msm8952_init_wsa_switch_supply(struct platform_device *pdev,
		if (ret) {
		dev_err(dev, "Setting voltage failed for regulator %s err = %d\n",
		switch_supply_str, ret);
		regulator_put(pdata->wsa_switch_supply.supply);
		pdata->wsa_switch_supply.supply = NULL;
		return ret;
		}
		@@ -2660,7 +2659,6 @@ int msm8952_init_wsa_switch_supply(struct platform_device *pdev,
		if (ret < 0) {
		dev_err(dev, "Setting current failed for regulator %s err = %d\n",
		switch_supply_str, ret);
		regulator_put(pdata->wsa_switch_supply.supply);
		pdata->wsa_switch_supply.supply = NULL;
		return ret;
		}