mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-17 16:15:18 +00:00
scsi: sr: Fix sr_probe() missing deallocate of device minor
[ Upstream commit 6555781b3f
]
If the cdrom fails to be registered then the device minor should be
deallocated.
Link: https://lore.kernel.org/r/072dac4b-8402-4de8-36bd-47e7588969cd@0882a8b5-c6c3-11e9-b005-00805fc181fe
Signed-off-by: Simon Arlott <simon@octiron.net>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
parent
8906aa8e57
commit
b69f3d2711
1 changed files with 5 additions and 1 deletions
|
@ -748,7 +748,7 @@ static int sr_probe(struct device *dev)
|
|||
cd->cdi.disk = disk;
|
||||
|
||||
if (register_cdrom(&cd->cdi))
|
||||
goto fail_put;
|
||||
goto fail_minor;
|
||||
|
||||
/*
|
||||
* Initialize block layer runtime PM stuffs before the
|
||||
|
@ -766,6 +766,10 @@ static int sr_probe(struct device *dev)
|
|||
|
||||
return 0;
|
||||
|
||||
fail_minor:
|
||||
spin_lock(&sr_index_lock);
|
||||
clear_bit(minor, sr_index_bits);
|
||||
spin_unlock(&sr_index_lock);
|
||||
fail_put:
|
||||
put_disk(disk);
|
||||
fail_free:
|
||||
|
|
Loading…
Reference in a new issue