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

Commit 2e1a28c6 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: mdss: Remove kfree when devm_kzalloc is used"

parents c3cedf53 e0f1e8e3

drivers/video/fbdev/msm/mdss_mdp.c

+4 −6
Original line number Diff line number Diff line
@@ -2098,10 +2098,9 @@ static u32 mdss_mdp_scaler_init(struct mdss_data_type *mdata, 
			devm_kzalloc(&mdata->pdev->dev, sizeof(u32) *

					mdata->scaler_off->ndest_scalers,

					GFP_KERNEL);

		if  (!mdata->scaler_off->dest_scaler_off) {

			kfree(mdata->scaler_off->dest_scaler_off);

		if  (!mdata->scaler_off->dest_scaler_off)

			return -ENOMEM;

		}



		ret = mdss_mdp_parse_dt_handler(mdata->pdev,

				"qcom,mdss-dest-scaler-off",

				mdata->scaler_off->dest_scaler_off,
@@ -2112,10 +2111,9 @@ static u32 mdss_mdp_scaler_init(struct mdss_data_type *mdata, 
			devm_kzalloc(&mdata->pdev->dev, sizeof(u32) *

					mdata->scaler_off->ndest_scalers,

					GFP_KERNEL);

		if  (!mdata->scaler_off->dest_scaler_lut_off) {

			kfree(mdata->scaler_off->dest_scaler_lut_off);

		if  (!mdata->scaler_off->dest_scaler_lut_off)

			return -ENOMEM;

		}



		ret = mdss_mdp_parse_dt_handler(mdata->pdev,

				"qcom,mdss-dest-scalers-lut-off",

				mdata->scaler_off->dest_scaler_lut_off,