diff options
| author | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-05 11:39:51 -0500 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2008-01-11 19:29:17 -0500 |
| commit | 210ba1d1724f5c4ed87a2ab1a21ca861a915f734 (patch) | |
| tree | 4b25acf59b91e2be49faf34507f3d9eeebff76a0 /drivers/scsi/sr.h | |
| parent | 32e8ae36b8f80372015b88b63c4358a376c9af0f (diff) | |
[SCSI] sr: update to follow tray status correctly
Based on an original patch from: David Martin <tasio@tasio.net>
When trying to get the drive status via ioctl CDROM_DRIVE_STATUS, with
no disk it gives CDS_TRAY_OPEN even if the tray is closed.
ioctl works as expected with ide-cd driver.
Gentoo bug report: http://bugs.gentoo.org/show_bug.cgi?id=196879
Cc: Maarten Bressers <mbres@gentoo.org>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/sr.h')
| -rw-r--r-- | drivers/scsi/sr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/sr.h b/drivers/scsi/sr.h index 0d04e2878c9d..81fbc0b78a52 100644 --- a/drivers/scsi/sr.h +++ b/drivers/scsi/sr.h | |||
| @@ -20,6 +20,9 @@ | |||
| 20 | #include <linux/genhd.h> | 20 | #include <linux/genhd.h> |
| 21 | #include <linux/kref.h> | 21 | #include <linux/kref.h> |
| 22 | 22 | ||
| 23 | #define MAX_RETRIES 3 | ||
| 24 | #define SR_TIMEOUT (30 * HZ) | ||
| 25 | |||
| 23 | struct scsi_device; | 26 | struct scsi_device; |
| 24 | 27 | ||
| 25 | /* The CDROM is fairly slow, so we need a little extra time */ | 28 | /* The CDROM is fairly slow, so we need a little extra time */ |