diff options
Diffstat (limited to 'drivers/cdrom/cdrom.c')
-rw-r--r-- | drivers/cdrom/cdrom.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c index d6653fc03b92..a59876a0bfa1 100644 --- a/drivers/cdrom/cdrom.c +++ b/drivers/cdrom/cdrom.c | |||
@@ -407,7 +407,6 @@ int register_cdrom(struct cdrom_device_info *cdi) | |||
407 | ENSURE(get_mcn, CDC_MCN); | 407 | ENSURE(get_mcn, CDC_MCN); |
408 | ENSURE(reset, CDC_RESET); | 408 | ENSURE(reset, CDC_RESET); |
409 | ENSURE(audio_ioctl, CDC_PLAY_AUDIO); | 409 | ENSURE(audio_ioctl, CDC_PLAY_AUDIO); |
410 | ENSURE(dev_ioctl, CDC_IOCTLS); | ||
411 | ENSURE(generic_packet, CDC_GENERIC_PACKET); | 410 | ENSURE(generic_packet, CDC_GENERIC_PACKET); |
412 | cdi->mc_flags = 0; | 411 | cdi->mc_flags = 0; |
413 | cdo->n_minors = 0; | 412 | cdo->n_minors = 0; |
@@ -2776,12 +2775,6 @@ int cdrom_ioctl(struct file * file, struct cdrom_device_info *cdi, | |||
2776 | return cdrom_ioctl_audioctl(cdi, cmd); | 2775 | return cdrom_ioctl_audioctl(cdi, cmd); |
2777 | } | 2776 | } |
2778 | 2777 | ||
2779 | /* | ||
2780 | * Finally, do the device specific ioctls | ||
2781 | */ | ||
2782 | if (CDROM_CAN(CDC_IOCTLS)) | ||
2783 | return cdi->ops->dev_ioctl(cdi, cmd, arg); | ||
2784 | |||
2785 | return -ENOSYS; | 2778 | return -ENOSYS; |
2786 | } | 2779 | } |
2787 | 2780 | ||