diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-11-07 04:01:32 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:54:05 -0500 |
commit | 6044ec8882c726e325017bd948aa0cd94ad33abc (patch) | |
tree | 3bfc5dc93434e8ad556540f6689abcd2699aa45d /drivers/acpi/container.c | |
parent | 2ea7533060e361810c21b2f5ee02151c4dfb85d8 (diff) |
[PATCH] kfree cleanup: misc remaining drivers
This is the remaining misc drivers/ part of the big kfree cleanup patch.
Remove pointless checks for NULL prior to calling kfree() in misc files in
drivers/.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Acked-by: Aristeu Sergio Rozanski Filho <aris@cathedrallabs.org>
Acked-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
Acked-by: Jean Delvare <khali@linux-fr.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Acked-by: Len Brown <len.brown@intel.com>
Acked-by: "Antonino A. Daplas" <adaplas@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/acpi/container.c')
-rw-r--r-- | drivers/acpi/container.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 10dd695a1dd9..27ec12c1fab0 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
@@ -118,11 +118,9 @@ static int acpi_container_remove(struct acpi_device *device, int type) | |||
118 | { | 118 | { |
119 | acpi_status status = AE_OK; | 119 | acpi_status status = AE_OK; |
120 | struct acpi_container *pc = NULL; | 120 | struct acpi_container *pc = NULL; |
121 | pc = (struct acpi_container *)acpi_driver_data(device); | ||
122 | |||
123 | if (pc) | ||
124 | kfree(pc); | ||
125 | 121 | ||
122 | pc = (struct acpi_container *)acpi_driver_data(device); | ||
123 | kfree(pc); | ||
126 | return status; | 124 | return status; |
127 | } | 125 | } |
128 | 126 | ||