diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-09-10 03:26:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-10 13:06:30 -0400 |
commit | f9101210e7aa72daf92722d451a2f7e3af5f781f (patch) | |
tree | 9554007e19387f2d05352ab03332be50c5b95f5b /drivers/isdn/i4l/isdn_common.c | |
parent | 887c27f369abc458556a5ce8ab22ddd498474307 (diff) |
[PATCH] vfree and kfree cleanup in drivers/
This patch does a full cleanup of 'NULL checks before vfree', and a partial
cleanup of calls to kfree for all of drivers/ - the kfree bit is partial in
that I only did the files that also had vfree calls in them. The patch
also gets rid of some redundant (void *) casts of pointers being passed to
[vk]free, and a some tiny whitespace corrections also crept in.
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/isdn/i4l/isdn_common.c')
-rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index eebcb0b97f0e..8a7d54a5c97d 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
@@ -1953,7 +1953,8 @@ isdn_add_channels(isdn_driver_t *d, int drvidx, int n, int adding) | |||
1953 | kfree(d->rcvcount); | 1953 | kfree(d->rcvcount); |
1954 | if (!(d->rcvcount = kmalloc(sizeof(int) * m, GFP_ATOMIC))) { | 1954 | if (!(d->rcvcount = kmalloc(sizeof(int) * m, GFP_ATOMIC))) { |
1955 | printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n"); | 1955 | printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n"); |
1956 | if (!adding) kfree(d->rcverr); | 1956 | if (!adding) |
1957 | kfree(d->rcverr); | ||
1957 | return -1; | 1958 | return -1; |
1958 | } | 1959 | } |
1959 | memset((char *) d->rcvcount, 0, sizeof(int) * m); | 1960 | memset((char *) d->rcvcount, 0, sizeof(int) * m); |