1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/net/s6gmac.c b/drivers/net/s6gmac.c
index 4525cbe8dd69..45f26344b368 100644
--- a/drivers/net/s6gmac.c
+++ b/drivers/net/s6gmac.c
@@ -373,9 +373,9 @@ struct s6gmac {
 static void s6gmac_rx_fillfifo(struct s6gmac *pd)
 {
         struct sk_buff *skb;
-        while ((((u8)(pd->rx_skb_i - pd->rx_skb_o)) < S6_NUM_RX_SKB)
-                        && (!s6dmac_fifo_full(pd->rx_dma, pd->rx_chan))
-                        && (skb = dev_alloc_skb(S6_MAX_FRLEN + 2))) {
+        while ((((u8)(pd->rx_skb_i - pd->rx_skb_o)) < S6_NUM_RX_SKB) &&
+               (!s6dmac_fifo_full(pd->rx_dma, pd->rx_chan)) &&
+               (skb = dev_alloc_skb(S6_MAX_FRLEN + 2))) {
                 pd->rx_skb[(pd->rx_skb_i++) % S6_NUM_RX_SKB] = skb;
                 s6dmac_put_fifo_cache(pd->rx_dma, pd->rx_chan,
                         pd->io, (u32)skb->data, S6_MAX_FRLEN);
@@ -984,7 +984,7 @@ static int __devinit s6gmac_probe(struct platform_device *pdev)
         pd->rx_dma = DMA_MASK_DMAC(i);
         pd->rx_chan = DMA_INDEX_CHNL(i);
         pd->io = platform_get_resource(pdev, IORESOURCE_IO, 0)->start;
-        res = request_irq(dev->irq, &s6gmac_interrupt, 0, dev->name, dev);
+        res = request_irq(dev->irq, s6gmac_interrupt, 0, dev->name, dev);
         if (res) {
                 printk(KERN_ERR DRV_PRMT "irq request failed: %d\n", dev->irq);
                 goto errirq;