Unverified Commit 0a378cfa authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8508 memory: fsl_ifc: fix leak of private memory on probe failure 

Merge Pull Request from: @ci-robot 
 
PR sync from: Tong Tiangen <tongtiangen@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/RJTDJCSLHLSHQPV4H4NE6TPJMMZIV7PJ/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RL3N 
 
Link:https://gitee.com/openeuler/kernel/pulls/8508

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Reviewed-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents a8e02fce 0e3875e1

drivers/memory/fsl_ifc.c

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,6 @@ static int fsl_ifc_ctrl_remove(struct platform_device *dev) 
	iounmap(ctrl->gregs);



	dev_set_drvdata(&dev->dev, NULL);

	kfree(ctrl);



	return 0;

}
@@ -221,7 +220,8 @@ static int fsl_ifc_ctrl_probe(struct platform_device *dev) 


	dev_info(&dev->dev, "Freescale Integrated Flash Controller\n");



	fsl_ifc_ctrl_dev = kzalloc(sizeof(*fsl_ifc_ctrl_dev), GFP_KERNEL);

	fsl_ifc_ctrl_dev = devm_kzalloc(&dev->dev, sizeof(*fsl_ifc_ctrl_dev),

					GFP_KERNEL);

	if (!fsl_ifc_ctrl_dev)

		return -ENOMEM;