diff options
Diffstat (limited to 'drivers/scsi/sr.c')
-rw-r--r-- | drivers/scsi/sr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index 64c867405ad4..ed179348de80 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
@@ -713,7 +713,6 @@ static int sr_probe(struct device *dev) | |||
713 | get_capabilities(cd); | 713 | get_capabilities(cd); |
714 | sr_vendor_init(cd); | 714 | sr_vendor_init(cd); |
715 | 715 | ||
716 | disk->driverfs_dev = &sdev->sdev_gendev; | ||
717 | set_capacity(disk, cd->capacity); | 716 | set_capacity(disk, cd->capacity); |
718 | disk->private_data = &cd->driver; | 717 | disk->private_data = &cd->driver; |
719 | disk->queue = sdev->request_queue; | 718 | disk->queue = sdev->request_queue; |
@@ -730,7 +729,7 @@ static int sr_probe(struct device *dev) | |||
730 | 729 | ||
731 | dev_set_drvdata(dev, cd); | 730 | dev_set_drvdata(dev, cd); |
732 | disk->flags |= GENHD_FL_REMOVABLE; | 731 | disk->flags |= GENHD_FL_REMOVABLE; |
733 | add_disk(disk); | 732 | device_add_disk(&sdev->sdev_gendev, disk); |
734 | 733 | ||
735 | sdev_printk(KERN_DEBUG, sdev, | 734 | sdev_printk(KERN_DEBUG, sdev, |
736 | "Attached scsi CD-ROM %s\n", cd->cdi.name); | 735 | "Attached scsi CD-ROM %s\n", cd->cdi.name); |