Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux-2.6-block.git] / drivers / net / wireless / adm8211.c

diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index 0ac09a2bd144049091e19ad9a56240cf62b7e64c..97afcec2475956a7f3346bdaa23195803d25fd56 100644 (file)
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1738,8 +1738,7 @@ static int adm8211_alloc_rings(struct ieee80211_hw *dev)
                return -ENOMEM;
        }
 
-       priv->tx_ring = (struct adm8211_desc *)(priv->rx_ring +
-                                               priv->rx_ring_size);
+       priv->tx_ring = priv->rx_ring + priv->rx_ring_size;
        priv->tx_ring_dma = priv->rx_ring_dma +
                            sizeof(struct adm8211_desc) * priv->rx_ring_size;