Commit 46c93e8e authored by Peter Osterlund's avatar Peter Osterlund Committed by Linus Torvalds

[PATCH] Fix incorrect Mt Rainier detection

cdrom_is_mrw() can incorrectly think that a drive is Mt Rainier capable,
because if forgets to check if the "GET CONFIGURATION" command returns the
MRW feature number.  According to the MMC spec, the drive shall return all
feature numbers >= the starting feature number, so even if the drive
doesn't support Mt Rainier, it can return some data that makes
cdrom_is_mrw() incorrectly think the drive is MRW capable.

This problem stops me from mounting DVD+RW discs in R/W mode on my laptop,
because it makes cdrom_open_write() call cdrom_mrw_open_write() which fails
because the drive isn't really MRW capable.

The fix is to make sure the returned feature number is the correct one for
Mt Rainier.
Signed-off-by: default avatarPeter Osterlund <petero2@telia.com>
Acked-by: default avatarJens Axboe <axboe@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1a32a102
......@@ -546,6 +546,8 @@ int cdrom_is_mrw(struct cdrom_device_info *cdi, int *write)
return ret;
mfd = (struct mrw_feature_desc *)&buffer[sizeof(struct feature_header)];
if (be16_to_cpu(mfd->feature_code) != CDF_MRW)
return 1;
*write = mfd->write;
if ((ret = cdrom_mrw_probe_pc(cdi))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment