summaryrefslogtreecommitdiffstats
path: root/drivers/cdrom/gdrom.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2020-04-25 09:57:00 +0200
committerJens Axboe <axboe@kernel.dk>2020-05-04 10:13:42 -0600
commita711d91cd97e6c9a554ccd1652527a7f36661857 (patch)
treef2cde770a237e0bc8415b86a709cfa070a0d7a21 /drivers/cdrom/gdrom.c
parent21f3cfeab304fc07b90d93d98d4d2f62110fe6b2 (diff)
downloadlinux-a711d91cd97e6c9a554ccd1652527a7f36661857.tar.gz
linux-a711d91cd97e6c9a554ccd1652527a7f36661857.tar.bz2
linux-a711d91cd97e6c9a554ccd1652527a7f36661857.zip
block: add a cdrom_device_info pointer to struct gendisk
Add a pointer to the CDROM information structure to struct gendisk. This will allow various removable media file systems to call directly into the CDROM layer instead of abusing ioctls with kernel pointers. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Damien Le Moal <damien.lemoal@wdc.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/cdrom/gdrom.c')
-rw-r--r--drivers/cdrom/gdrom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c
index c51292c2a131..09b0cd292720 100644
--- a/drivers/cdrom/gdrom.c
+++ b/drivers/cdrom/gdrom.c
@@ -770,7 +770,7 @@ static int probe_gdrom(struct platform_device *devptr)
goto probe_fail_no_disk;
}
probe_gdrom_setupdisk();
- if (register_cdrom(gd.cd_info)) {
+ if (register_cdrom(gd.disk, gd.cd_info)) {
err = -ENODEV;
goto probe_fail_cdrom_register;
}