rpms/kernel/F-10 linux-2.6-cdrom-door-status.patch,1.4,1.4.2.1

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1043

Modified Files:
      Tag: private-fedora-10-2_6_27
	linux-2.6-cdrom-door-status.patch 
Log Message:
replace with official patch for -stable

linux-2.6-cdrom-door-status.patch:
 sr_ioctl.c |    5 +++++
 1 file changed, 5 insertions(+)

Index: linux-2.6-cdrom-door-status.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/linux-2.6-cdrom-door-status.patch,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -p -r1.4 -r1.4.2.1
--- linux-2.6-cdrom-door-status.patch	16 Dec 2008 16:31:01 -0000	1.4
+++ linux-2.6-cdrom-door-status.patch	17 Aug 2009 06:23:00 -0000	1.4.2.1
@@ -1,7 +1,10 @@
-From e85e03d7f680b62bb8d4d037fdde6dd94c9582a3 Mon Sep 17 00:00:00 2001
 From: Peter Jones <pjones at redhat.com>
-Date: Wed, 8 Oct 2008 15:10:39 -0400
-Subject: [PATCH] make sr_mod report more accurate drive status after closing the door.
+Date: Fri, 11 Jul 2008 20:17:05 +0000 (-0400)
+Subject: [SCSI] sr: report more accurate drive status after closing the tray.
+X-Git-Tag: v2.6.30-rc5~53^2~52
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=96bcc722c47d07b6fd05c9d0cb3ab8ea5574c5b1
+
+[SCSI] sr: report more accurate drive status after closing the tray.
 
 So, what's happening here is that the drive is reporting a sense of
 2/4/1 ("logical unit is becoming ready") from sr_test_unit_ready(), and
@@ -13,13 +16,13 @@ not, but there's no way to express that 
 
 My current thought is that if it told us the device isn't yet ready, we
 should return that immediately, since there's nothing that'll tell us
-any more data than that reliably.
+any more data than that reliably:
+
+Signed-off-by: James Bottomley <James.Bottomley at HansenPartnership.com>
 ---
- drivers/scsi/sr_ioctl.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c
-index ae87d08..7ee51ff 100644
+index d92ff51..291236e 100644
 --- a/drivers/scsi/sr_ioctl.c
 +++ b/drivers/scsi/sr_ioctl.c
 @@ -309,6 +309,11 @@ int sr_drive_status(struct cdrom_device_info *cdi, int slot)
@@ -34,6 +37,3 @@ index ae87d08..7ee51ff 100644
  	if (!cdrom_get_media_event(cdi, &med)) {
  		if (med.media_present)
  			return CDS_DISC_OK;
--- 
-1.6.0.1
-