cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
Subsystems (2)
PATCH 1/1 cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
According to MMC-3 (or any later versions) READ TOCs are mandatory commands and have nothing to do with CDC_PLAY_AUDIO. I have no idea why the check was put there in the first place but it now only breaks automatic actions on certain drives.
Note that this test was only effective when ide-cdrom was being used as sr didn't mask CDC_PLAY_AUDIO according to the capabilities.
--- drivers/cdrom/cdrom.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/cdrom/cdrom.c +0 -4
@@ -1491,10 +1491,6 @@ static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype* tracks) tracks->xa=0 ; tracks->error=0 ;cdinfo (CD_COUNT_TRACKS ,"entering cdrom_count_tracks\n" ); -if (!CDROM_CAN (CDC_PLAY_AUDIO )) { - tracks->error=CDS_NO_INFO ; -return ; - }/* Grab the TOC header so we can see how many tracks there are */ if ((ret = cdi->ops->audio_ioctl (cdi,CDROMREADTOCHDR , &header))) {if (ret == -ENOMEDIUM )
Quoted 9 lines · Tejun Heo
According to MMC-3 (or any later versions) READ TOCs are mandatory commands and have nothing to do with
CDC_PLAY_AUDIO. I have no idea why the check was put there in the first place but it now only breaks automatic actions on certain drives.Note that this test was only effective when ide-cdrom was being used as sr didn't mask
CDC_PLAY_AUDIOaccording to the capabilities.Signed-off-by Tejun Heo <[email protected]>
Quoted 19 lines
--- drivers/cdrom/cdrom.c | 4 ---- 1 file changed, 4 deletions(-)drivers/cdrom/cdrom.c +0
-4@@ -1491,10 +1491,6 @@ static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype* tracks) tracks->xa=0 ; tracks->error=0 ;cdinfo (CD_COUNT_TRACKS ,"entering cdrom_count_tracks\n" ); -if (!CDROM_CAN (CDC_PLAY_AUDIO )) { - tracks->error=CDS_NO_INFO ; -return ; - }/* Grab the TOC header so we can see how many tracks there are */ if ((ret = cdi->ops->audio_ioctl (cdi,CDROMREADTOCHDR , &header))) {if (ret == -ENOMEDIUM )
Signature · 1 line
Jens Axboe
Quoted 6 lines · Tejun Heo
According to MMC-3 (or any later versions) READ TOCs are mandatory commands and have nothing to do with
CDC_PLAY_AUDIO. I have no idea why the check was put there in the first place but it now only breaks automatic actions on certain drives.Note that this test was only effective when ide-cdrom was being used
Quoted 22 lines
as sr didn't mask
CDC_PLAY_AUDIOaccording to the capabilities.Signed-off-by Tejun Heo <[email protected]>--- drivers/cdrom/cdrom.c | 4 ---- 1 file changed, 4 deletions(-)drivers/cdrom/cdrom.c +0
-4@@ -1491,10 +1491,6 @@ static void cdrom_count_tracks(struct cdrom_device_info *cdi, tracktype* tracks) tracks->xa=0 ; tracks->error=0 ;cdinfo (CD_COUNT_TRACKS ,"entering cdrom_count_tracks\n" ); -if (!CDROM_CAN (CDC_PLAY_AUDIO )) { - tracks->error=CDS_NO_INFO ; -return ; - }/* Grab the TOC header so we can see how many tracks there are */ if ((ret = cdi->ops->audio_ioctl (cdi,CDROMREADTOCHDR , &header))) {if (ret == -ENOMEDIUM )