diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2007-11-18 11:10:04 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 19:15:31 -0800 |
| commit | 2f9b0b5e46f0381fd41af8cb9ed4daffee59d4f3 (patch) | |
| tree | f57a08b00f6e2d70e48afc3f54fe5c27078686b9 | |
| parent | 9e893bb8530d9c09b1eb8da8734eebf4182bb8b7 (diff) | |
| download | linux-3.10-2f9b0b5e46f0381fd41af8cb9ed4daffee59d4f3.tar.gz linux-3.10-2f9b0b5e46f0381fd41af8cb9ed4daffee59d4f3.tar.bz2 linux-3.10-2f9b0b5e46f0381fd41af8cb9ed4daffee59d4f3.zip | |
Amiga zorro bus: Add missing zorro_device_remove()
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>
| -rw-r--r-- | drivers/zorro/zorro-driver.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/zorro/zorro-driver.c b/drivers/zorro/zorro-driver.c index 067c07be928..e6c4390d8bd 100644 --- a/drivers/zorro/zorro-driver.c +++ b/drivers/zorro/zorro-driver.c @@ -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 @@ -128,6 +142,7 @@ struct bus_type zorro_bus_type = { .name = "zorro", .match = zorro_bus_match, .probe = zorro_device_probe, + .remove = zorro_device_remove, }; |