Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / skfp / hwmtm.c

diff --git a/drivers/net/skfp/hwmtm.c b/drivers/net/skfp/hwmtm.c
index 438f424e63611ca73f372aa74207713507d34bb5..8a430a36654705fdc5fba5be36b20d3342db5aa4 100644 (file)
--- a/drivers/net/skfp/hwmtm.c
+++ b/drivers/net/skfp/hwmtm.c
@@ -1746,7 +1746,7 @@ static void queue_llc_rx(struct s_smc *smc, SMbuf *mb)
        DB_GEN("queue_llc_rx: mb = %x",(void *)mb,0,4) ;
        smc->os.hwm.queued_rx_frames++ ;
        mb->sm_next = (SMbuf *)NULL ;
-       if (smc->os.hwm.llc_rx_pipe == 0) {
+       if (smc->os.hwm.llc_rx_pipe == NULL) {
                smc->os.hwm.llc_rx_pipe = mb ;
        }
        else {
@@ -1786,7 +1786,7 @@ static void queue_txd_mb(struct s_smc *smc, SMbuf *mb)
        DB_GEN("_rx: queue_txd_mb = %x",(void *)mb,0,4) ;
        smc->os.hwm.queued_txd_mb++ ;
        mb->sm_next = (SMbuf *)NULL ;
-       if (smc->os.hwm.txd_tx_pipe == 0) {
+       if (smc->os.hwm.txd_tx_pipe == NULL) {
                smc->os.hwm.txd_tx_pipe = mb ;
        }
        else {