* [PATCH] cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
@ 2008-06-17 5:20 Tejun Heo
2008-06-17 8:06 ` Jens Axboe
2008-06-17 9:43 ` Bartlomiej Zolnierkiewicz
0 siblings, 2 replies; 3+ messages in thread
From: Tejun Heo @ 2008-06-17 5:20 UTC (permalink / raw)
To: IDE/ATA development list, Linux Kernel, Jens Axboe
Cc: Bartlomiej Zolnierkiewicz
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>
---
drivers/cdrom/cdrom.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 69f26eb..11574c5 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
2008-06-17 5:20 [PATCH] cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks() Tejun Heo
@ 2008-06-17 8:06 ` Jens Axboe
2008-06-17 9:43 ` Bartlomiej Zolnierkiewicz
1 sibling, 0 replies; 3+ messages in thread
From: Jens Axboe @ 2008-06-17 8:06 UTC (permalink / raw)
To: Tejun Heo
Cc: IDE/ATA development list, Linux Kernel, Bartlomiej Zolnierkiewicz
On Tue, Jun 17 2008, Tejun Heo wrote:
> 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>
> ---
> drivers/cdrom/cdrom.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
> index 69f26eb..11574c5 100644
> --- a/drivers/cdrom/cdrom.c
> +++ b/drivers/cdrom/cdrom.c
> @@ -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)
--
Jens Axboe
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks()
2008-06-17 5:20 [PATCH] cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks() Tejun Heo
2008-06-17 8:06 ` Jens Axboe
@ 2008-06-17 9:43 ` Bartlomiej Zolnierkiewicz
1 sibling, 0 replies; 3+ messages in thread
From: Bartlomiej Zolnierkiewicz @ 2008-06-17 9:43 UTC (permalink / raw)
To: Tejun Heo
Cc: IDE/ATA development list, Linux Kernel, Jens Axboe,
Borislav Petkov
On Tuesday 17 June 2008, Tejun Heo wrote:
> 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
cc:ing Borislav
> as sr didn't mask CDC_PLAY_AUDIO according to the capabilities.
>
> Signed-off-by: Tejun Heo <tj@kernel.org>
> ---
> drivers/cdrom/cdrom.c | 4 ----
> 1 file changed, 4 deletions(-)
>
> diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
> index 69f26eb..11574c5 100644
> --- a/drivers/cdrom/cdrom.c
> +++ b/drivers/cdrom/cdrom.c
> @@ -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)
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-06-17 9:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-17 5:20 [PATCH] cdrom: don't check CDC_PLAY_AUDIO in cdrom_count_tracks() Tejun Heo
2008-06-17 8:06 ` Jens Axboe
2008-06-17 9:43 ` Bartlomiej Zolnierkiewicz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).