diff --git a/[refs] b/[refs] index 6f0ce7632913..6681671076f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9cabe52c27cf834137f3aaa46da23bcf32284e8 +refs/heads/master: 1ffde03d2aa112750468cff07efc9e0a504517dd diff --git a/trunk/drivers/net/3c503.c b/trunk/drivers/net/3c503.c index d84f6e8903a5..5b732988d493 100644 --- a/trunk/drivers/net/3c503.c +++ b/trunk/drivers/net/3c503.c @@ -412,7 +412,7 @@ el2_open(struct net_device *dev) outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR); outb_p(0x00, E33G_IDCFR); msleep(1); - free_irq(*irqp, el2_probe_interrupt); + free_irq(*irqp, &seen); if (!seen) continue; @@ -422,6 +422,7 @@ el2_open(struct net_device *dev) continue; if (retval < 0) goto err_disable; + break; } while (*++irqp); if (*irqp == 0) {