Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

[pandora-kernel.git] / drivers / net / ll_temac_main.c

diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index da8d0a0..336e7c7 100644 (file)
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -231,8 +231,8 @@ static void temac_set_multicast_list(struct net_device *ndev)
        int i;
 
        mutex_lock(&lp->indirect_mutex);
-       if (ndev->flags & (IFF_ALLMULTI | IFF_PROMISC)
-                       || ndev->mc_count > MULTICAST_CAM_TABLE_NUM) {
+       if (ndev->flags & (IFF_ALLMULTI | IFF_PROMISC) ||
+           ndev->mc_count > MULTICAST_CAM_TABLE_NUM) {
                /*
                 *      We must make the kernel realise we had to move
                 *      into promisc mode or we start all out war on
@@ -865,7 +865,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
        dcrs = dcr_resource_start(np, 0);
        if (dcrs == 0) {
                dev_err(&op->dev, "could not get DMA register address\n");
-               goto nodev;;
+               goto nodev;
        }
        lp->sdma_dcrs = dcr_map(np, dcrs, dcr_resource_len(np, 0));
        dev_dbg(&op->dev, "DCR base: %x\n", dcrs);