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

Commit 350d048c authored by Ming Lei's avatar Ming Lei Committed by Greg Kroah-Hartman
Browse files

scsi: sd: Free scsi_disk device via put_device() 

[ Upstream commit 265dfe8ebbabae7959060bd1c3f75c2473b697ed ]

After a device is initialized via device_initialize() it should be freed
via put_device(). sd_probe() currently gets this wrong, fix it up.

Link: https://lore.kernel.org/r/20210906090112.531442-1-ming.lei@redhat.com


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4f194b57

drivers/scsi/sd.c

+5 −4
Original line number Diff line number Diff line
@@ -3345,15 +3345,16 @@ static int sd_probe(struct device *dev) 
	}



	device_initialize(&sdkp->dev);

	sdkp->dev.parent = dev;

	sdkp->dev.parent = get_device(dev);

	sdkp->dev.class = &sd_disk_class;

	dev_set_name(&sdkp->dev, "%s", dev_name(dev));



	error = device_add(&sdkp->dev);

	if (error)

		goto out_free_index;

	if (error) {

		put_device(&sdkp->dev);

		goto out;

	}



	get_device(dev);

	dev_set_drvdata(dev, sdkp);



	gd->major = sd_major((index & 0xf0) >> 4);