[RAMEN9610-21500]Input: ff-memless - kill timer in destroy()

[GitHub/MotorolaMobilityLLC/kernel-slsi.git] / block / scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 7440de44dd8577e1a3483b2a1c9d581329fe20e9..63da33334a0eec294c015077bf8215aa3705e51b 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -706,6 +706,8 @@ int scsi_verify_blk_ioctl(struct block_device *bd, unsigned int cmd)
        case SG_GET_RESERVED_SIZE:
        case SG_SET_RESERVED_SIZE:
        case SG_EMULATED_HOST:
+       case SCSI_IOCTL_SECURITY_PROTOCOL_IN:
+       case SCSI_IOCTL_SECURITY_PROTOCOL_OUT:
                return 0;
        case CDROM_GET_CAPABILITY:
                /* Keep this until we remove the printk below.  udev sends it