[PATCH 4/10] net: remove cli()/sti() from drivers/net/hamradio/dmascc.c

[James Nelson <james4765@xxxxxxxxxxx>]

Signed-off-by: James Nelson <james4765@xxxxxxxxx>

diff -urN --exclude='*~' linux-2.6.10-mm2-original/drivers/net/hamradio/dmascc.c linux-2.6.10-mm2/drivers/net/hamradio/dmascc.c
--- linux-2.6.10-mm2-original/drivers/net/hamradio/dmascc.c	2005-01-08 12:16:35.000000000 -0500
+++ linux-2.6.10-mm2/drivers/net/hamradio/dmascc.c	2005-01-11 17:39:18.000000000 -0500
@@ -1034,15 +1034,14 @@
   if (t == 0) {
     tm_isr(priv);
   } else if (t > 0) {
-    save_flags(flags);
-    cli();
+    spin_lock_irqsave(priv->register_lock, flags);
     outb(t & 0xFF, priv->tmr_cnt);
     outb((t >> 8) & 0xFF, priv->tmr_cnt);
     if (priv->type != TYPE_TWIN) {
       write_scc(priv, R15, r15 | CTSIE);
       priv->rr0 |= CTS;
     }
-    restore_flags(flags);
+    spin_unlock_irqrestore(priv->register_lock, flags);
   }
 }
 
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html