de620.c: nitpicking

@@ -563,7 +563,6 @@
 		printk(KERN_WARNING "%s: No tx-buffer available!\n", dev->name);
 		restore_flags(flags);
 		return 1;
-		break;
 	}
 	de620_write_block(dev, buffer, len);
 

@@ -1899,7 +1899,6 @@
 		hostdata->script, start);
 	    printk ("scsi%d : DSPS = 0x%x\n", host->host_no,
 		NCR53c7x0_read32(DSPS_REG));
-	    restore_flags(flags);
 	    return -1;
 	}
     	hostdata->test_running = 0;

@@ -717,6 +717,13 @@
      Ken Mort <[email protected]> reported a DEBUG compile bug fixed
      in 3.2K.
 
+     Arnaldo Carvalho de Melo <[email protected]> fix issues
+     related to save_flags/restore_flags, some restore_flags and
+     DvcLeaveCritical were missing, use unsigned long flags instead
+     of int flags, a not needed cli commented out, like the sti
+     that matches it (in advansys_abort) - 08/01/2001
+     
+
   L. AdvanSys Contact Information
  
      Mail:                   Advanced System Products, Inc.

@@ -2098,8 +2105,8 @@
 STATIC uchar     AscGetChipIRQ(PortAddr, ushort);
 STATIC uchar     AscSetChipIRQ(PortAddr, uchar, ushort);
 STATIC ushort    AscGetChipBiosAddress(PortAddr, ushort);
-STATIC int       DvcEnterCritical(void);
-STATIC void      DvcLeaveCritical(int);
+STATIC unsigned long DvcEnterCritical(void);
+STATIC void      DvcLeaveCritical(unsigned long);
 STATIC void      DvcInPortWords(PortAddr, ushort *, int);
 STATIC void      DvcOutPortWords(PortAddr, ushort *, int);
 STATIC void      DvcOutPortDWords(PortAddr, ASC_DCNT *, int);

@@ -3103,8 +3110,8 @@
 /*
  * Device drivers must define the following functions.
  */
-STATIC int   DvcEnterCritical(void);
-STATIC void  DvcLeaveCritical(int);
+STATIC unsigned long  DvcEnterCritical(void);
+STATIC void  DvcLeaveCritical(unsigned long);
 STATIC void  DvcSleepMilliSecond(ADV_DCNT);
 STATIC uchar DvcAdvReadPCIConfigByte(ADV_DVC_VAR *, ushort);
 STATIC void  DvcAdvWritePCIConfigByte(ADV_DVC_VAR *, ushort, uchar);

@@ -5938,7 +5945,7 @@
 {
     struct Scsi_Host    *shp;
     asc_board_t         *boardp;
-    int                 flags;
+    unsigned long       flags;
     Scsi_Cmnd           *done_scp;
 
     shp = scp->host;

@@ -6033,7 +6040,7 @@
     asc_board_t         *boardp;
     ASC_DVC_VAR         *asc_dvc_varp;
     ADV_DVC_VAR         *adv_dvc_varp;
-    int                 flags;
+    unsigned long       flags;
     int                 do_scsi_done;
     int                 scp_found;
     Scsi_Cmnd           *done_scp = NULL;

@@ -6138,7 +6145,7 @@
                     ret = SCSI_ABORT_ERROR;
                     break;
                 }
-                cli();
+                /* cli(); XXX */
             } else {
                 /*
                  * Wide Board

@@ -6278,7 +6285,7 @@
     asc_board_t          *boardp;
     ASC_DVC_VAR          *asc_dvc_varp;
     ADV_DVC_VAR          *adv_dvc_varp;
-    int                  flags;
+    unsigned long        flags;
     Scsi_Cmnd            *done_scp = NULL, *last_scp = NULL;
     Scsi_Cmnd            *tscp, *new_last_scp;
     int                  do_scsi_done;

@@ -9954,10 +9961,10 @@
 #endif /* version < v2.1.0 */ 
 }
 
-STATIC int
+STATIC unsigned long
 DvcEnterCritical(void)
 {
-    int    flags;
+    unsigned long flags;
 
     save_flags(flags);
     cli();

@@ -9965,7 +9972,7 @@
 }
 
 STATIC void
-DvcLeaveCritical(int flags)
+DvcLeaveCritical(unsigned long flags)
 {
     restore_flags(flags);
 }

@@ -12173,7 +12180,7 @@
 )
 {
     PortAddr            iop_base;
-    int                 last_int_level;
+    unsigned long       last_int_level;
     int                 sta;
     int                 n_q_required;
     int                 disable_syn_offset_one_fix;

@@ -12235,6 +12242,7 @@
 #if !CC_VERY_LONG_SG_LIST
         if (sg_entry_cnt > ASC_MAX_SG_LIST)
         {
+            DvcLeaveCritical(last_int_level);
             return(ERR);
         }
 #endif /* !CC_VERY_LONG_SG_LIST */

@@ -13112,7 +13120,7 @@
     ASC_QDONE_INFO      scsiq_buf;
     ASC_QDONE_INFO *scsiq;
     ASC_ISR_CALLBACK    asc_isr_callback;
-    int                 last_int_level;
+    unsigned long       last_int_level;
 
     iop_base = asc_dvc->iop_base;
     asc_isr_callback = asc_dvc->isr_callback;

@@ -13137,6 +13145,7 @@
                             (ushort) (q_addr + (ushort) ASC_SCSIQ_B_STATUS),
                                  scsiq->q_status);
                 (*asc_isr_callback) (asc_dvc, scsiq);
+    		DvcLeaveCritical(last_int_level);
                 return (1);
             }
         }

@@ -13158,7 +13167,7 @@
     ASC_QDONE_INFO      scsiq_buf;
     ASC_QDONE_INFO *scsiq;
     ASC_ISR_CALLBACK    asc_isr_callback;
-    int                 last_int_level;
+    unsigned long       last_int_level;
 
     iop_base = asc_dvc->iop_base;
     asc_isr_callback = asc_dvc->isr_callback;

@@ -17570,7 +17579,7 @@
 AdvExeScsiQueue(ADV_DVC_VAR *asc_dvc,
                 ADV_SCSI_REQ_Q *scsiq)
 {
-    int                    last_int_level;
+    unsigned long          last_int_level;
     AdvPortAddr            iop_base;
     ADV_DCNT               req_size;
     ADV_PADDR              req_paddr;

@@ -17598,6 +17607,7 @@
      */
     if ((new_carrp = asc_dvc->carr_freelist) == NULL)
     {
+       DvcLeaveCritical(last_int_level);
        return ADV_BUSY;
     }
     asc_dvc->carr_freelist =

@@ -17835,7 +17845,7 @@
     ushort                      target_bit;
     ADV_CARR_T                  *free_carrp;
     ADV_VADDR                   irq_next_vpa;
-    int                         flags;
+    unsigned long               flags;
     ADV_SCSI_REQ_Q              *scsiq;
 
     flags = DvcEnterCritical();

@@ -17848,6 +17858,7 @@
     if ((int_stat & (ADV_INTR_STATUS_INTRA | ADV_INTR_STATUS_INTRB |
          ADV_INTR_STATUS_INTRC)) == 0)
     {
+        DvcLeaveCritical(flags);
         return ADV_FALSE;
     }
 

@@ -17982,7 +17993,7 @@
                ushort idle_cmd,
                ADV_DCNT idle_cmd_parameter)
 {
-    int         last_int_level;
+    unsigned long last_int_level;
     int         result;
     ADV_DCNT    i, j;
     AdvPortAddr iop_base;

@@ -28,6 +28,7 @@
  *		          of irqs. Use dev_id.
  * Christoph Hellwig	: adapted to module_init/module_exit
  * Aki Laukkanen	: added power management support
+ * Arnaldo C. de Melo	: added missing restore_flags in ad1848_resume
  *
  * Status:
  *		Tested. Believed fully functional.

@@ -2751,6 +2752,7 @@
 		bits = interrupt_bits[devc->irq];
 		if (bits == -1) {
 			printk(KERN_ERR "MSS: Bad IRQ %d\n", devc->irq);
+			restore_flags(flags);
 			return -1;
 		}
 

@@ -16,6 +16,7 @@
  * Christoph Hellwig	: adapted to module_init/module_exit
  * Bartlomiej Zolnierkiewicz : added __init to attach_sscape()
  * Chris Rankin		: Specify that this module owns the coprocessor
+ * Arnaldo C. de Melo	: added missing restore_flags in sscape_pnp_upload_file
  */
 
 #include <linux/init.h>

@@ -969,7 +970,10 @@
 		memcpy(devc->raw_buf, dt, l); dt += l;
 		sscape_start_dma(devc->dma, devc->raw_buf_phys, l, 0x48);
 		sscape_pnp_start_dma ( devc, 0 );
-		if (sscape_pnp_wait_dma ( devc, 0 ) == 0) return 0;
+		if (sscape_pnp_wait_dma ( devc, 0 ) == 0) {
+			restore_flags(flags);	    
+			return 0;
+		}
 	}
 	
 	restore_flags(flags);	    

@@ -9,6 +9,9 @@
  *
  * Rewrite for Unified ADB by Joshua M. Thompson ([email protected])
  *
+ * Arnaldo Carvalho de Melo <[email protected]>
+ * - restore_flags on failure in macii_init - 09/01/2001
+ *
  * 1999-08-02 (jmt) - Initial rewrite for Unified ADB.
  */
  

@@ -147,15 +150,16 @@
 	cli();
 	
 	err = macii_init_via();
-	if (err) return err;
+	if (err) goto out;
 
 	err = request_irq(IRQ_MAC_ADB, macii_interrupt, IRQ_FLG_LOCK, "ADB",
 		    macii_interrupt);
-	if (err) return err;
+	if (err) goto out;
 
 	macii_state = idle;
-	restore_flags(flags);	
-	return 0;
+	err = 0;
+out:	restore_flags(flags);	
+	return err;
 }
 
 /* initialize the hardware */	

@@ -435,15 +435,14 @@
 	for(;length;length--) {
 		keyb_cmds[keyb_cmd_write++]=*(cmd++);
 		if(keyb_cmd_write==keyb_cmd_read)
-			return;
+			goto out;
 		if(keyb_cmd_write==APOLLO_KEYB_CMD_ENTRIES)
 			keyb_cmd_write=0;
 	}
 	if(!keyb_cmd_transmit)  {
  	   sio01.BRGtest_cra=5;
 	}
-	restore_flags(flags);
-
+out:	restore_flags(flags);
 }
 
 static struct busmouse apollo_mouse = {