patch-2.3.1 linux/drivers/scsi/scsi_ioctl.c

• Lines: 18
• Date: Tue May 11 14:37:40 1999
• Orig file: v2.3.0/linux/drivers/scsi/scsi_ioctl.c
• Orig date: Thu Apr 29 11:53:41 1999

diff -u --recursive --new-file v2.3.0/linux/drivers/scsi/scsi_ioctl.c linux/drivers/scsi/scsi_ioctl.c
@@ -113,7 +113,7 @@
     SCSI_LOG_IOCTL(1, printk("Trying ioctl with scsi command %d\n", cmd[0]));
     SCpnt = scsi_allocate_device(NULL, dev, 1);
     {
-	struct semaphore sem = MUTEX_LOCKED;
+	DECLARE_MUTEX_LOCKED(sem);
 	SCpnt->request.sem = &sem;
 	scsi_do_cmd(SCpnt,  cmd, NULL,  0, scsi_ioctl_done,  timeout, retries);
 	spin_unlock_irqrestore(&io_request_lock, flags);
@@ -289,7 +289,7 @@
     SCpnt = scsi_allocate_device(NULL, dev, 1);
 
     {
-	struct semaphore sem = MUTEX_LOCKED;
+	DECLARE_MUTEX_LOCKED(sem);
 	SCpnt->request.sem = &sem;
 	scsi_do_cmd(SCpnt,  cmd,  buf, needed,  scsi_ioctl_done,
 		    timeout, retries);