patch-2.1.31 linux/drivers/scsi/sr.c

Next file: linux/drivers/scsi/st.c
Previous file: linux/drivers/scsi/sg.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.30/linux/drivers/scsi/sr.c linux/drivers/scsi/sr.c
@@ -423,7 +423,7 @@
  	     * from user space, since we do not want to
  	     * sleep from an interrupt.
  	     */
- 	    if( SDev->removable && !intr_count )
+ 	    if( SDev->removable && !in_interrupt() )
  	    {
 		scsi_ioctl(SDev, SCSI_IOCTL_DOORLOCK, 0);
  	    }

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov