The patch titled
Amiga zorro bus: Add missing zorro_device_remove()
has been added to the -mm tree. Its filename is
amiga-zorro-bus-add-missing-zorro_device_remove.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Amiga zorro bus: Add missing zorro_device_remove()
From: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
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@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/zorro/zorro-driver.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff -puN drivers/zorro/zorro-driver.c~amiga-zorro-bus-add-missing-zorro_device_remove drivers/zorro/zorro-driver.c
--- a/drivers/zorro/zorro-driver.c~amiga-zorro-bus-add-missing-zorro_device_remove
+++ a/drivers/zorro/zorro-driver.c
@@ -60,6 +60,20 @@ static int zorro_device_probe(struct 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,
};
_
Patches currently in -mm which might be from geert@xxxxxxxxxxxxxx are
m68k-export-atari_keyb_init.patch
amiga-zorro-bus-add-missing-zorro_device_remove.patch
mac68k-mailing-list-addresss.patch
git-scsi-misc.patch
m68k-use-cc-cross-prefix.patch
uml-borrow-consth-techniques.patch
remove-pointless-casts-from-void-pointers.patch
cleanup-after-apus-removal.patch
add-cmpxchg_local-to-m86k.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
