android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] pktcdvd: Fix the logic in the pkt_writable_track function

Browse Source 
Fix the pkt_writable_track() function to make it work correctly for all types
of CD/DVD discs.

Signed-off-by: Peter Osterlund <petero2@telia.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Peter Osterlund 2006-02-20 18:28:04 -08:00 committed by Linus Torvalds
parent 3b4828047d
commit ab863ec342
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/block/pktcdvd.c
View File

@ -1499,28 +1499,30 @@ static int pkt_set_write_settings(struct pktcdvd_device *pd)
/* /*
* 1 -- we can write to this track, 0 -- we can't * 1 -- we can write to this track, 0 -- we can't
*/ */
static int pkt_writable_track(track_information *ti) static int pkt_writable_track(struct pktcdvd_device *pd, track_information *ti)
{ {
/* switch (pd->mmc3_profile) {
* only good for CD-RW at the moment, not DVD-RW case 0x1a: /* DVD+RW */
*/ case 0x12: /* DVD-RAM */
/* The track is always writable on DVD+RW/DVD-RAM */
return 1;
default:
break;
}
/* if (!ti->packet || !ti->fp)
* FIXME: only for FP return 0;
*/
if (ti->fp == 0)
return 1;
/* /*
* "good" settings as per Mt Fuji. * "good" settings as per Mt Fuji.
*/ */
if (ti->rt == 0 && ti->blank == 0 && ti->packet == 1) if (ti->rt == 0 && ti->blank == 0)
return 1; return 1;
if (ti->rt == 0 && ti->blank == 1 && ti->packet == 1) if (ti->rt == 0 && ti->blank == 1)
return 1; return 1;
if (ti->rt == 1 && ti->blank == 0 && ti->packet == 1) if (ti->rt == 1 && ti->blank == 0)
return 1; return 1;
printk("pktcdvd: bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet); printk("pktcdvd: bad state %d-%d-%d\n", ti->rt, ti->blank, ti->packet);
@ -1605,7 +1607,7 @@ static int pkt_probe_settings(struct pktcdvd_device *pd)
return ret; return ret;
} }
if (!pkt_writable_track(&ti)) { if (!pkt_writable_track(pd, &ti)) {
printk("pktcdvd: can't write to this track\n"); printk("pktcdvd: can't write to this track\n");
return -ENXIO; return -ENXIO;
} }