1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 247c8ca86033..dd1dc32dc98d 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -1487,11 +1487,8 @@ static int hp100_start_xmit_bm(struct sk_buff *skb, struct net_device *dev)
         if (skb->len <= 0)
                 return 0;
                 
-        if (skb->len < ETH_ZLEN && lp->chip == HP100_CHIPID_SHASTA) {
-                skb = skb_padto(skb, ETH_ZLEN);
-                if (skb == NULL)
-                        return 0;
-        }
+        if (lp->chip == HP100_CHIPID_SHASTA && skb_padto(skb, ETH_ZLEN))
+                return 0;
 
         /* Get Tx ring tail pointer */
         if (lp->txrtail->next == lp->txrhead) {