diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2008-11-24 20:40:00 +0100 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2009-01-04 23:50:37 +0100 |
| commit | d6053e08f5520dcb58c200d2e1861d9c505b72e8 (patch) | |
| tree | c845001fc7ca7f5aa76b53edb2e036b18ee3dbc4 | |
| parent | 621f6dd715209d3c3c27841943ae71fc2c75c9f5 (diff) | |
| download | kernel-crypto-d6053e08f5520dcb58c200d2e1861d9c505b72e8.tar.gz kernel-crypto-d6053e08f5520dcb58c200d2e1861d9c505b72e8.tar.xz kernel-crypto-d6053e08f5520dcb58c200d2e1861d9c505b72e8.zip | |
firewire: fix small memory leak at module removal
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
| -rw-r--r-- | drivers/firewire/fw-device.c | 2 | ||||
| -rw-r--r-- | drivers/firewire/fw-device.h | 2 | ||||
| -rw-r--r-- | drivers/firewire/fw-transaction.c | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/drivers/firewire/fw-device.c b/drivers/firewire/fw-device.c index 6b9be42c7b9..31b6c74d34d 100644 --- a/drivers/firewire/fw-device.c +++ b/drivers/firewire/fw-device.c @@ -617,7 +617,7 @@ static int shutdown_unit(struct device *device, void *data) */ DECLARE_RWSEM(fw_device_rwsem); -static DEFINE_IDR(fw_device_idr); +DEFINE_IDR(fw_device_idr); int fw_cdev_major; struct fw_device *fw_device_get_by_devt(dev_t devt) diff --git a/drivers/firewire/fw-device.h b/drivers/firewire/fw-device.h index 42305bbac72..df51732608d 100644 --- a/drivers/firewire/fw-device.h +++ b/drivers/firewire/fw-device.h @@ -21,6 +21,7 @@ #include <linux/fs.h> #include <linux/cdev.h> +#include <linux/idr.h> #include <linux/rwsem.h> #include <asm/atomic.h> @@ -99,6 +100,7 @@ void fw_device_cdev_update(struct fw_device *device); void fw_device_cdev_remove(struct fw_device *device); extern struct rw_semaphore fw_device_rwsem; +extern struct idr fw_device_idr; extern int fw_cdev_major; /* diff --git a/drivers/firewire/fw-transaction.c b/drivers/firewire/fw-transaction.c index 2884f876397..699ac041f39 100644 --- a/drivers/firewire/fw-transaction.c +++ b/drivers/firewire/fw-transaction.c @@ -19,6 +19,7 @@ */ #include <linux/completion.h> +#include <linux/idr.h> #include <linux/kernel.h> #include <linux/kref.h> #include <linux/module.h> @@ -971,6 +972,7 @@ static void __exit fw_core_cleanup(void) { unregister_chrdev(fw_cdev_major, "firewire"); bus_unregister(&fw_bus_type); + idr_destroy(&fw_device_idr); } module_init(fw_core_init); |