diff options
Diffstat (limited to 'drivers/scsi/sr.c')
| -rw-r--r-- | drivers/scsi/sr.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 4dcd735ea49e..0c4aa4665a2f 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c @@ -792,7 +792,7 @@ static int sr_probe(struct device *dev) disk->queue = sdev->request_queue; if (register_cdrom(disk, &cd->cdi)) - goto fail_put; + goto fail_minor; /* * Initialize block layer runtime PM stuffs before the @@ -810,8 +810,13 @@ 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); + mutex_destroy(&cd->lock); fail_free: kfree(cd); fail: |