diff options
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/i4l/isdn_bsdcomp.c | 14 | ||||
| -rw-r--r-- | drivers/isdn/i4l/isdn_common.c | 3 |
2 files changed, 7 insertions, 10 deletions
diff --git a/drivers/isdn/i4l/isdn_bsdcomp.c b/drivers/isdn/i4l/isdn_bsdcomp.c index baf4bcad9bf9..0afe442db3b0 100644 --- a/drivers/isdn/i4l/isdn_bsdcomp.c +++ b/drivers/isdn/i4l/isdn_bsdcomp.c | |||
| @@ -283,23 +283,19 @@ static void bsd_free (void *state) | |||
| 283 | /* | 283 | /* |
| 284 | * Release the dictionary | 284 | * Release the dictionary |
| 285 | */ | 285 | */ |
| 286 | if (db->dict) { | 286 | vfree(db->dict); |
| 287 | vfree (db->dict); | 287 | db->dict = NULL; |
| 288 | db->dict = NULL; | ||
| 289 | } | ||
| 290 | 288 | ||
| 291 | /* | 289 | /* |
| 292 | * Release the string buffer | 290 | * Release the string buffer |
| 293 | */ | 291 | */ |
| 294 | if (db->lens) { | 292 | vfree(db->lens); |
| 295 | vfree (db->lens); | 293 | db->lens = NULL; |
| 296 | db->lens = NULL; | ||
| 297 | } | ||
| 298 | 294 | ||
| 299 | /* | 295 | /* |
| 300 | * Finally release the structure itself. | 296 | * Finally release the structure itself. |
| 301 | */ | 297 | */ |
| 302 | kfree (db); | 298 | kfree(db); |
| 303 | } | 299 | } |
| 304 | } | 300 | } |
| 305 | 301 | ||
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); |
