Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / drivers / net / ethernet / natsemi / macsonic.c

diff --git a/drivers/net/ethernet/natsemi/macsonic.c b/drivers/net/ethernet/natsemi/macsonic.c
index 9e4ddbba70363b8fdedf412b6c830a44f1a0f045..d98f5b8a1c66ec39f1e0a5db6bd1d834ee09a65b 100644 (file)
--- a/drivers/net/ethernet/natsemi/macsonic.c
+++ b/drivers/net/ethernet/natsemi/macsonic.c
@@ -326,13 +326,9 @@ static int mac_onboard_sonic_probe(struct net_device *dev)
            macintosh_config->ident == MAC_MODEL_P588 ||
            macintosh_config->ident == MAC_MODEL_P575 ||
            macintosh_config->ident == MAC_MODEL_C610) {
-               unsigned long flags;
                int card_present;
 
-               local_irq_save(flags);
                card_present = hwreg_present((void*)ONBOARD_SONIC_REGISTERS);
-               local_irq_restore(flags);
-
                if (!card_present) {
                        printk("none.\n");
                        return -ENODEV;
@@ -634,7 +630,6 @@ static struct platform_driver mac_sonic_driver = {
        .remove = mac_sonic_device_remove,
        .driver = {
                .name   = mac_sonic_string,
-               .owner  = THIS_MODULE,
        },
 };