Commit af744e32 authored Aug 05, 2008 by Tejun Heo Committed by Bartlomiej Zolnierkiewicz Aug 05, 2008

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.

Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Jens Axboe <jens.axboe@oracle.com>
Cc: Borislav Petkov <petkovbb@googlemail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

parent 938bb03d

drivers/cdrom/cdrom.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -1436,10 +1436,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)

Admin message