2 files changed, 8 insertions, 1 deletions

diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index ba9c3e0387ce..b811dd0eb240 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;
 }
diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 50cb34ffef11..e8c2433ad8a8 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -148,6 +148,7 @@ struct scsi_device {
         unsigned retry_hwerror:1;       /* Retry HARDWARE_ERROR */
         unsigned last_sector_bug:1;     /* do not use multisector accesses on
                                            SD_LAST_BUGGY_SECTORS */
+        unsigned no_read_disc_info:1;   /* Avoid READ_DISC_INFO cmds */
         unsigned is_visible:1;  /* is the device visible in sysfs */
 
         DECLARE_BITMAP(supported_events, SDEV_EVT_MAXBITS); /* supported events */