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

Commit f4f0f63e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

nvme: fix drvdata setup for the nvme device 



Pass the right private data to device_create_with_groups from the
beginning, and remove the superflous call to dev_set_drvdata.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJon Derrick <jonathan.derrick@intel.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 949928c1

drivers/nvme/host/core.c

+1 −2
Original line number Diff line number Diff line
@@ -1383,14 +1383,13 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev, 


	ctrl->device = device_create_with_groups(nvme_class, ctrl->dev,

				MKDEV(nvme_char_major, ctrl->instance),

				dev, nvme_dev_attr_groups,

				ctrl, nvme_dev_attr_groups,

				"nvme%d", ctrl->instance);

	if (IS_ERR(ctrl->device)) {

		ret = PTR_ERR(ctrl->device);

		goto out_release_instance;

	}

	get_device(ctrl->device);

	dev_set_drvdata(ctrl->device, ctrl);



	spin_lock(&dev_list_lock);

	list_add_tail(&ctrl->node, &nvme_ctrl_list);