The patch titled
cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
has been added to the -mm tree. Its filename is
cdrom-dont-check-cdc_play_audio-in-cdrom_count_tracks.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
From: Tejun Heo <tj@xxxxxxxxxx>
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@xxxxxxxxxx>
Acked-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@xxxxxxxxx>
Cc: Borislav Petkov <petkovbb@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/cdrom/cdrom.c | 4 ----
1 file changed, 4 deletions(-)
diff -puN drivers/cdrom/cdrom.c~cdrom-dont-check-cdc_play_audio-in-cdrom_count_tracks drivers/cdrom/cdrom.c
--- a/drivers/cdrom/cdrom.c~cdrom-dont-check-cdc_play_audio-in-cdrom_count_tracks
+++ a/drivers/cdrom/cdrom.c
@@ -1491,10 +1491,6 @@ static void cdrom_count_tracks(struct cd
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)
_
Patches currently in -mm which might be from tj@xxxxxxxxxx are
pci-vt3336-cant-do-msi-either.patch
cdrom-dont-check-cdc_play_audio-in-cdrom_count_tracks.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
