diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 02:06:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-07 02:06:12 -0500 |
| commit | 23a56e2cbec2860ef02d6720508fbcb07accc8b4 (patch) | |
| tree | a05a6b49944202b492ae492434a25f849e2616ba /drivers/net/wan/dscc4.c | |
| parent | 6bd0e10e53cc4824cd8cdaab8c370e53ab2e23c2 (diff) | |
| parent | 3cfc15103aa56c2c7ee6dd312c24a8d1697bade1 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/wan/dscc4.c')
| -rw-r--r-- | drivers/net/wan/dscc4.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index 2f61a47b4716..1ff5de076d21 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c @@ -1943,7 +1943,7 @@ static int dscc4_init_ring(struct net_device *dev) (++i%TX_RING_SIZE)*sizeof(*tx_fd)); } while (i < TX_RING_SIZE); - if (dscc4_init_dummy_skb(dpriv) < 0) + if (!dscc4_init_dummy_skb(dpriv)) goto err_free_dma_tx; memset(dpriv->rx_skbuff, 0, sizeof(struct sk_buff *)*RX_RING_SIZE); |