Skip to content

Commit

Permalink
Amiga zorro bus: Add missing zorro_device_remove()
Browse files Browse the repository at this point in the history
Amiga zorro bus: Add missing zorro_device_remove(). Without this ifconfig and
/proc/net/dev oops after unloading a Zorro network device driver module.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed Nov 27, 2007
1 parent 9e893bb commit 2f9b0b5
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions drivers/zorro/zorro-driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,20 @@ static int zorro_device_probe(struct device *dev)
}


static int zorro_device_remove(struct device *dev)
{
struct zorro_dev *z = to_zorro_dev(dev);
struct zorro_driver *drv = to_zorro_driver(dev->driver);

if (drv) {
if (drv->remove)
drv->remove(z);
z->driver = NULL;
}
return 0;
}


/**
* zorro_register_driver - register a new Zorro driver
* @drv: the driver structure to register
Expand Down Expand Up @@ -128,6 +142,7 @@ struct bus_type zorro_bus_type = {
.name = "zorro",
.match = zorro_bus_match,
.probe = zorro_device_probe,
.remove = zorro_device_remove,
};


Expand Down

0 comments on commit 2f9b0b5

Please sign in to comment.