[PATCH] SCC warning fix

From: Alan Cox <alan@redhat.com>

Just a warning fix and behaviour tidy. Changing the kiss.mintime variable isn't
going to work as its exposed to user space

diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c
index 0eec5d3e8d8bc0005cdba28d8e5f6d4fcb7b7c09..7d4afa3bd16a9e99c59079c0de0583a9c5541124 100644 (file)
--- a/drivers/net/hamradio/scc.c
+++ b/drivers/net/hamradio/scc.c
@@ -1196,11 +1196,7 @@ static void t_tail(unsigned long channel)
        if (scc->stat.tx_state == TXS_TIMEOUT)          /* we had a timeout? */
        {
                scc->stat.tx_state = TXS_WAIT;
-
-               if (scc->kiss.mintime != TIMER_OFF)     /* try it again */
-                       scc_start_tx_timer(scc, t_dwait, scc->kiss.mintime*100);
-               else
-                       scc_start_tx_timer(scc, t_dwait, 0);
+               scc_start_tx_timer(scc, t_dwait, scc->kiss.mintime*100);
                return;
        }
        
@@ -1274,8 +1270,7 @@ static void t_idle(unsigned long channel)
        del_timer(&scc->tx_wdog);
 
        scc_key_trx(scc, TX_OFF);
-
-       if (scc->kiss.mintime != TIMER_OFF)
+       if(scc->kiss.mintime)
                scc_start_tx_timer(scc, t_dwait, scc->kiss.mintime*100);
        scc->stat.tx_state = TXS_WAIT;
 }