patch-2.1.122 linux/drivers/cdrom/cdu31a.c

• Lines: 26
• Date: Mon Sep 14 11:34:01 1998
• Orig file: v2.1.121/linux/drivers/cdrom/cdu31a.c
• Orig date: Mon Aug 3 12:45:45 1998

diff -u --recursive --new-file v2.1.121/linux/drivers/cdrom/cdu31a.c linux/drivers/cdrom/cdu31a.c
@@ -160,6 +160,7 @@
 #include <linux/string.h>
 #include <linux/malloc.h>
 #include <linux/init.h>
+#include <linux/interrupt.h>
 
 #include <asm/system.h>
 #include <asm/io.h>
@@ -1690,7 +1691,7 @@
    /* Make sure we have a valid TOC. */
    sony_get_toc(); 
 
-   sti();
+   spin_unlock_irq(&io_request_lock);
 
    /* Make sure the timer is cancelled. */
    del_timer(&cdu31a_abort_timer);
@@ -1849,7 +1850,7 @@
    }
 
 end_do_cdu31a_request:
-   cli();
+   spin_lock_irq(&io_request_lock);
 #if 0
    /* After finished, cancel any pending operations. */
    abort_read();