From 2875a660cc4e27fab40ad1b91476f187d18c0f39 Mon Sep 17 00:00:00 2001 From: Abraham Arce Date: Fri, 16 Apr 2010 14:48:43 +0000 Subject: [PATCH] --- yaml --- r: 190233 b: refs/heads/master c: 761172fbf672c5784b2a0d71ca2f4389eb7a2c21 h: refs/heads/master i: 190231: 7cfc5f35e0cc1bb5e4b40aa0fd579b60da79a7d4 v: v3 --- [refs] | 2 +- trunk/drivers/net/ks8851.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0824a9ae58a8..fa8be88aaabc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df245dce572bc22b230a05532a3f9daee50effb5 +refs/heads/master: 761172fbf672c5784b2a0d71ca2f4389eb7a2c21 diff --git a/trunk/drivers/net/ks8851.c b/trunk/drivers/net/ks8851.c index 13cc1ca261d9..9e9f9b349766 100644 --- a/trunk/drivers/net/ks8851.c +++ b/trunk/drivers/net/ks8851.c @@ -722,12 +722,14 @@ static void ks8851_tx_work(struct work_struct *work) txb = skb_dequeue(&ks->txq); last = skb_queue_empty(&ks->txq); - ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA); - ks8851_wrpkt(ks, txb, last); - ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr); - ks8851_wrreg16(ks, KS_TXQCR, TXQCR_METFE); + if (txb != NULL) { + ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr | RXQCR_SDA); + ks8851_wrpkt(ks, txb, last); + ks8851_wrreg16(ks, KS_RXQCR, ks->rc_rxqcr); + ks8851_wrreg16(ks, KS_TXQCR, TXQCR_METFE); - ks8851_done_tx(ks, txb); + ks8851_done_tx(ks, txb); + } } mutex_unlock(&ks->lock);