rpms/kernel/F-10 kernel.spec, 1.1193, 1.1194 linux-2.6-cdrom-door-status.patch, 1.3, 1.4

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec linux-2.6-cdrom-door-status.patch 
Log Message:
Fix the CDROM door status patch right this time. (from rawhide)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1193
retrieving revision 1.1194
diff -u -r1.1193 -r1.1194
--- kernel.spec	15 Dec 2008 16:00:29 -0000	1.1193
+++ kernel.spec	16 Dec 2008 16:31:01 -0000	1.1194
@@ -1933,6 +1933,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Dec 16 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.9-158
+- Fix the CDROM door status patch right this time. (from rawhide)
+
 * Mon Dec 15 2008 John W. Linville <linville at redhat.com> 2.6.27.9-157
 - iwlagn: fix RX skb alignment
 

linux-2.6-cdrom-door-status.patch:

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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-cdrom-door-status.patch	18 Nov 2008 02:30:52 -0000	1.3
+++ linux-2.6-cdrom-door-status.patch	16 Dec 2008 16:31:01 -0000	1.4
@@ -27,7 +27,7 @@
  		return CDS_DISC_OK;
  
 +	/* SK/ASC/ASCQ of 2/4/1 means "unit is becoming ready" */
-+	if ((scsi_sense_valid(&sshdr) & sshdr.sense_key) == NOT_READY
++	if (scsi_sense_valid(&sshdr) && sshdr.sense_key == NOT_READY
 +			&& sshdr.asc == 0x04 && sshdr.ascq == 0x01)
 +		return CDS_DRIVE_NOT_READY;
 +