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/video.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/video.c')
-rw-r--r-- | drivers/acpi/video.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index e383d6109ae1..f051b151580d 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
@@ -334,8 +334,7 @@ acpi_video_device_lcd_query_levels(struct acpi_video_device *device, | |||
334 | return_VALUE(0); | 334 | return_VALUE(0); |
335 | 335 | ||
336 | err: | 336 | err: |
337 | if (buffer.pointer) | 337 | kfree(buffer.pointer); |
338 | kfree(buffer.pointer); | ||
339 | 338 | ||
340 | return_VALUE(status); | 339 | return_VALUE(status); |
341 | } | 340 | } |
@@ -1488,8 +1487,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video) | |||
1488 | } | 1487 | } |
1489 | active_device_list[count].value.int_val = ACPI_VIDEO_HEAD_END; | 1488 | active_device_list[count].value.int_val = ACPI_VIDEO_HEAD_END; |
1490 | 1489 | ||
1491 | if (video->attached_array) | 1490 | kfree(video->attached_array); |
1492 | kfree(video->attached_array); | ||
1493 | 1491 | ||
1494 | video->attached_array = active_device_list; | 1492 | video->attached_array = active_device_list; |
1495 | video->attached_count = count; | 1493 | video->attached_count = count; |
@@ -1645,8 +1643,7 @@ static int acpi_video_bus_put_devices(struct acpi_video_bus *video) | |||
1645 | printk(KERN_WARNING PREFIX | 1643 | printk(KERN_WARNING PREFIX |
1646 | "hhuuhhuu bug in acpi video driver.\n"); | 1644 | "hhuuhhuu bug in acpi video driver.\n"); |
1647 | 1645 | ||
1648 | if (data->brightness) | 1646 | kfree(data->brightness); |
1649 | kfree(data->brightness); | ||
1650 | 1647 | ||
1651 | kfree(data); | 1648 | kfree(data); |
1652 | } | 1649 | } |
@@ -1831,8 +1828,7 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type) | |||
1831 | acpi_video_bus_put_devices(video); | 1828 | acpi_video_bus_put_devices(video); |
1832 | acpi_video_bus_remove_fs(device); | 1829 | acpi_video_bus_remove_fs(device); |
1833 | 1830 | ||
1834 | if (video->attached_array) | 1831 | kfree(video->attached_array); |
1835 | kfree(video->attached_array); | ||
1836 | kfree(video); | 1832 | kfree(video); |
1837 | 1833 | ||
1838 | return_VALUE(0); | 1834 | return_VALUE(0); |