---

yaml --- r: 221478 b: refs/heads/master c: b847917 h: refs/heads/master v: v3
git-mirror · Oct 25, 2010 · 51de978 · 51de978
1 parent e85d24c
commit 51de978
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0ee31cb5df4b717de923266879964d0418c3308f
+refs/heads/master: b8479178901557dc323a69ee254c1c732e85e0e5
diff --git a/trunk/drivers/scsi/sr_ioctl.c b/trunk/drivers/scsi/sr_ioctl.c
@@ -324,6 +324,15 @@ int sr_drive_status(struct cdrom_device_info *cdi, int slot)
 			return CDS_NO_DISC;
 	}
 
+	/*
+	 * SK/ASC/ASCQ of 2/4/2 means "initialization required"
+	 * Using CD_TRAY_OPEN results in an START_STOP_UNIT to close
+	 * the tray, which resolves the initialization requirement.
+	 */
+	if (scsi_sense_valid(&sshdr) && sshdr.sense_key == NOT_READY
+			&& sshdr.asc == 0x04 && sshdr.ascq == 0x02)
+		return CDS_TRAY_OPEN;
+
 	/*
 	 * 0x04 is format in progress .. but there must be a disc present!
 	 */