1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index e148341079b5..d7b383c96d5d 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -862,10 +862,16 @@ static void get_capabilities(struct scsi_cd *cd)
 static int sr_packet(struct cdrom_device_info *cdi,
                 struct packet_command *cgc)
 {
+        struct scsi_cd *cd = cdi->handle;
+        struct scsi_device *sdev = cd->device;
+
+        if (cgc->cmd[0] == GPCMD_READ_DISC_INFO && sdev->no_read_disc_info)
+                return -EDRIVE_CANT_DO_THIS;
+
         if (cgc->timeout <= 0)
                 cgc->timeout = IOCTL_TIMEOUT;
 
-        sr_do_ioctl(cdi->handle, cgc);
+        sr_do_ioctl(cd, cgc);
 
         return cgc->stat;
 }