Unverified Commit 1398fff0 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11270 nvme: apple: fix device reference counting 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/DPKT5A5OY4VHE4BRRIJ4OS6M2XBAUUN4/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAMMBA 
 
Link:https://gitee.com/openeuler/kernel/pulls/11270

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents c92d5c85 6afca39a

drivers/nvme/host/apple.c

+22 −5
Original line number Diff line number Diff line
@@ -1387,7 +1387,7 @@ static void devm_apple_nvme_mempool_destroy(void *data) 
	mempool_destroy(data);

}



static int apple_nvme_probe(struct platform_device *pdev)

static struct apple_nvme *apple_nvme_alloc(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct apple_nvme *anv;
@@ -1395,7 +1395,7 @@ static int apple_nvme_probe(struct platform_device *pdev) 


	anv = devm_kzalloc(dev, sizeof(*anv), GFP_KERNEL);

	if (!anv)

		return -ENOMEM;

		return ERR_PTR(-ENOMEM);



	anv->dev = get_device(dev);

	anv->adminq.is_adminq = true;
@@ -1515,10 +1515,26 @@ static int apple_nvme_probe(struct platform_device *pdev) 
		goto put_dev;

	}



	return anv;

put_dev:

	put_device(anv->dev);

	return ERR_PTR(ret);

}



static int apple_nvme_probe(struct platform_device *pdev)

{

	struct apple_nvme *anv;

	int ret;



	anv = apple_nvme_alloc(pdev);

	if (IS_ERR(anv))

		return PTR_ERR(anv);



	anv->ctrl.admin_q = blk_mq_init_queue(&anv->admin_tagset);

	if (IS_ERR(anv->ctrl.admin_q)) {

		ret = -ENOMEM;

		goto put_dev;

		anv->ctrl.admin_q = NULL;

		goto out_uninit_ctrl;

	}



	nvme_reset_ctrl(&anv->ctrl);
@@ -1526,8 +1542,9 @@ static int apple_nvme_probe(struct platform_device *pdev) 


	return 0;



put_dev:

	put_device(anv->dev);

out_uninit_ctrl:

	nvme_uninit_ctrl(&anv->ctrl);

	nvme_put_ctrl(&anv->ctrl);

	return ret;

}