diff --git a/[refs] b/[refs] index 43f2b6dcd6ac..b5846810e164 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8aa06af4d09b7ca1ca6126b1b8ddec4a9e67fb3a +refs/heads/master: bdb0f8672ff6f601a32df5af40f11526b741985c diff --git a/trunk/drivers/net/wd.c b/trunk/drivers/net/wd.c index 746a5ee32f33..eb72c67699ab 100644 --- a/trunk/drivers/net/wd.c +++ b/trunk/drivers/net/wd.c @@ -358,8 +358,10 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr) #endif err = register_netdev(dev); - if (err) + if (err) { free_irq(dev->irq, dev); + iounmap(ei_status.mem); + } return err; }