Merge branch 'master' of /home/aia21/ntfs-2.6/

1 files changed, 5 insertions, 3 deletions

diff --git a/drivers/cdrom/cdu31a.c b/drivers/cdrom/cdu31a.c
index 378e88d20757..72ffd64e8b1e 100644
--- a/drivers/cdrom/cdu31a.c
+++ b/drivers/cdrom/cdu31a.c
@@ -2668,7 +2668,7 @@ static int scd_audio_ioctl(struct cdrom_device_info *cdi,
         return retval;
 }
 
-static int scd_dev_ioctl(struct cdrom_device_info *cdi,
+static int scd_read_audio(struct cdrom_device_info *cdi,
                          unsigned int cmd, unsigned long arg)
 {
         void __user *argp = (void __user *)arg;
@@ -2894,11 +2894,10 @@ static struct cdrom_device_ops scd_dops = {
         .get_mcn                = scd_get_mcn,
         .reset                  = scd_reset,
         .audio_ioctl            = scd_audio_ioctl,
-        .dev_ioctl              = scd_dev_ioctl,
         .capability             = CDC_OPEN_TRAY | CDC_CLOSE_TRAY | CDC_LOCK |
                                   CDC_SELECT_SPEED | CDC_MULTI_SESSION |
                                   CDC_MCN | CDC_MEDIA_CHANGED | CDC_PLAY_AUDIO |
-                                  CDC_RESET | CDC_IOCTLS | CDC_DRIVE_STATUS,
+                                  CDC_RESET | CDC_DRIVE_STATUS,
         .n_minors               = 1,
 };
 
@@ -2936,6 +2935,9 @@ static int scd_block_ioctl(struct inode *inode, struct file *file,
                 case CDROMCLOSETRAY:
                         retval = scd_tray_move(&scd_info, 0);
                         break;
+                case CDROMREADAUDIO:
+                        retval = scd_read_audio(&scd_info, CDROMREADAUDIO, arg);
+                        break;
                 default:
                         retval = cdrom_ioctl(file, &scd_info, inode, cmd, arg);
         }