[PATCH RESEND] SCSI not showing tray status correctly

Maarten Bressers
2007-10-25T22:30:38Z

From: David Martin <tasio@tasio.net>

Greetings,

The following patch was submitted to the lkml in 2004 by David Martin
(http://lkml.org/lkml/2004/12/27/1). It wasn't accepted, but I was
unable to find a reason why, so I'm resending it now.

Without this patch the SCSI ioctl CDROM_DRIVE_STATUS always returns
CDS_TRAY_OPEN even if the tray is closed. This patch fixes that.
Gentoo bug report: http://bugs.gentoo.org/show_bug.cgi?id=196879

Signed-off by: Maarten Bressers <mbres@gentoo.org>

---

--- a/drivers/scsi/sr_ioctl.c 2007-10-09 22:31:38.000000000 +0200
+++ b/drivers/scsi/sr_ioctl.c 2007-10-25 22:57:21.000000000 +0200
@@ -310,6 +310,8 @@ int sr_lock_door(struct cdrom_device_inf

int sr_drive_status(struct cdrom_device_info *cdi, int slot)
{
+ struct media_event_desc med;
+
if (CDSL_CURRENT != slot) {
/* we have no changer support */
return -EINVAL;
@@ -317,7 +319,10 @@ int sr_drive_status(struct cdrom_device_
if (0 == test_unit_ready(cdi->handle))
return CDS_DISC_OK;

- return CDS_TRAY_OPEN;
+ if (!cdrom_get_media_event(cdi, &med) && med.door_open)
+ return CDS_TRAY_OPEN;
+
+ return CDS_NO_DISC;
}

int sr_disk_status(struct cdrom_device_info *cdi)