summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sr_ioctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/sr_ioctl.c')
-rw-r--r--drivers/scsi/sr_ioctl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
index e864582b3..1d34cf7ec 100644
--- a/drivers/scsi/sr_ioctl.c
+++ b/drivers/scsi/sr_ioctl.c
@@ -106,8 +106,8 @@ retry:
break;
case ILLEGAL_REQUEST:
if (!quiet)
- printk("sr%d: CDROM (ioctl) reports ILLEGAL REQUEST.\n",
- target);
+ printk(KERN_ERR "sr%d: CDROM (ioctl) reports ILLEGAL "
+ "REQUEST.\n", target);
if (SCpnt->sense_buffer[12] == 0x20 &&
SCpnt->sense_buffer[13] == 0x00) {
/* sense: Invalid command operation code */
@@ -121,7 +121,7 @@ retry:
#endif
break;
default:
- printk("sr%d: CDROM (ioctl) error, command: ", target);
+ printk(KERN_ERR "sr%d: CDROM (ioctl) error, command: ", target);
print_command(sr_cmd);
print_sense("sr", SCpnt);
err = -EIO;
@@ -792,7 +792,7 @@ int sr_dev_ioctl(struct cdrom_device_info *cdi,
return 0;
case BLKRASET:
- if(!suser())
+ if(!capable(CAP_SYS_ADMIN))
return -EACCES;
if(!(cdi->dev))
return -EINVAL;
@@ -804,7 +804,7 @@ int sr_dev_ioctl(struct cdrom_device_info *cdi,
RO_IOCTLS(cdi->dev,arg);
case BLKFLSBUF:
- if(!suser())
+ if(!capable(CAP_SYS_ADMIN))
return -EACCES;
if(!(cdi->dev))
return -EINVAL;