Merge branch 'for-2637/i2c/samsung' into next-i2c

[pandora-kernel.git] / drivers / net / 3c523.c

diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index a7b0e5e..de579d0 100644 (file)
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -287,7 +287,7 @@ static int elmc_open(struct net_device *dev)
 
        elmc_id_attn586();      /* disable interrupts */
 
-       ret = request_irq(dev->irq, elmc_interrupt, IRQF_SHARED | IRQF_SAMPLE_RANDOM,
+       ret = request_irq(dev->irq, elmc_interrupt, IRQF_SHARED,
                          dev->name, dev);
        if (ret) {
                pr_err("%s: couldn't get irq %d\n", dev->name, dev->irq);
@@ -463,7 +463,7 @@ static int __init do_elmc_probe(struct net_device *dev)
 
        /* we didn't find any 3c523 in the slots we checked for */
        if (slot == MCA_NOTFOUND)
-               return ((base_addr || irq) ? -ENXIO : -ENODEV);
+               return (base_addr || irq) ? -ENXIO : -ENODEV;
 
        mca_set_adapter_name(slot, "3Com 3c523 Etherlink/MC");
        mca_set_adapter_procfn(slot, (MCA_ProcFn) elmc_getinfo, dev);