1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
--- linux/drivers/scsi/sr.c.old Fri Sep 20 16:00:34 1996
+++ linux/drivers/scsi/sr.c Mon Mar 3 21:32:10 1997
@@ -545,6 +545,7 @@
case SCSI_MAN_SONY: /* Thomas QUINOT <thomas@melchior.cuivre.fdn.fr> */
case SCSI_MAN_PIONEER:
+ case SCSI_MAN_UNKNOWN:
#ifdef DEBUG
printk(KERN_DEBUG "sr_photocd: use SONY/PIONEER code\n");
#endif
@@ -563,7 +564,7 @@
printk(KERN_WARNING "sr_photocd: ioctl error (SONY/PIONEER): 0x%x\n",rc);
break;
}
- if ((rec[0] << 8) + rec[1] != 0x0a) {
+ if ((rec[0] << 8) + rec[1] < 0x0a) {
printk(KERN_INFO "sr_photocd: (SONY/PIONEER) Hmm, seems the CDROM doesn't support multisession CD's\n");
no_multi = 1;
break;
@@ -577,7 +578,6 @@
break;
case SCSI_MAN_NEC_OLDCDR:
- case SCSI_MAN_UNKNOWN:
default:
sector = 0;
no_multi = 1;
@@ -601,6 +601,7 @@
if (filp->f_mode & 2)
return -EROFS;
+ sr_ioctl(inode,filp,CDROMCLOSETRAY,0);
check_disk_change(inode->i_rdev);
if(!scsi_CDs[MINOR(inode->i_rdev)].device->access_count++)
|
