|
@@ -408,7 +408,6 @@ int register_cdrom(struct cdrom_device_info *cdi)
|
|
ENSURE(get_last_session, CDC_MULTI_SESSION);
|
|
ENSURE(get_last_session, CDC_MULTI_SESSION);
|
|
ENSURE(get_mcn, CDC_MCN);
|
|
ENSURE(get_mcn, CDC_MCN);
|
|
ENSURE(reset, CDC_RESET);
|
|
ENSURE(reset, CDC_RESET);
|
|
- ENSURE(audio_ioctl, CDC_PLAY_AUDIO);
|
|
|
|
ENSURE(generic_packet, CDC_GENERIC_PACKET);
|
|
ENSURE(generic_packet, CDC_GENERIC_PACKET);
|
|
cdi->mc_flags = 0;
|
|
cdi->mc_flags = 0;
|
|
cdo->n_minors = 0;
|
|
cdo->n_minors = 0;
|
|
@@ -2506,8 +2505,6 @@ static int cdrom_ioctl_get_subchnl(struct cdrom_device_info *cdi,
|
|
|
|
|
|
/* cdinfo(CD_DO_IOCTL,"entering CDROMSUBCHNL\n");*/
|
|
/* cdinfo(CD_DO_IOCTL,"entering CDROMSUBCHNL\n");*/
|
|
|
|
|
|
- if (!CDROM_CAN(CDC_PLAY_AUDIO))
|
|
|
|
- return -ENOSYS;
|
|
|
|
if (copy_from_user(&q, argp, sizeof(q)))
|
|
if (copy_from_user(&q, argp, sizeof(q)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
@@ -2538,8 +2535,6 @@ static int cdrom_ioctl_read_tochdr(struct cdrom_device_info *cdi,
|
|
|
|
|
|
/* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCHDR\n"); */
|
|
/* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCHDR\n"); */
|
|
|
|
|
|
- if (!CDROM_CAN(CDC_PLAY_AUDIO))
|
|
|
|
- return -ENOSYS;
|
|
|
|
if (copy_from_user(&header, argp, sizeof(header)))
|
|
if (copy_from_user(&header, argp, sizeof(header)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|
|
@@ -2562,8 +2557,6 @@ static int cdrom_ioctl_read_tocentry(struct cdrom_device_info *cdi,
|
|
|
|
|
|
/* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCENTRY\n"); */
|
|
/* cdinfo(CD_DO_IOCTL, "entering CDROMREADTOCENTRY\n"); */
|
|
|
|
|
|
- if (!CDROM_CAN(CDC_PLAY_AUDIO))
|
|
|
|
- return -ENOSYS;
|
|
|
|
if (copy_from_user(&entry, argp, sizeof(entry)))
|
|
if (copy_from_user(&entry, argp, sizeof(entry)))
|
|
return -EFAULT;
|
|
return -EFAULT;
|
|
|
|
|