diff options
Diffstat (limited to 'drivers/isdn/i4l')
| -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 baf4bcad9bf..0afe442db3b 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)  		/*  		 * Release the dictionary  		 */ -		if (db->dict) { -			vfree (db->dict); -			db->dict = NULL; -		} +		vfree(db->dict); +		db->dict = NULL;  		/*  		 * Release the string buffer  		 */ -		if (db->lens) { -			vfree (db->lens); -			db->lens = NULL; -		} +		vfree(db->lens); +		db->lens = NULL;  		/*  		 * Finally release the structure itself.  		 */ -		kfree (db); +		kfree(db);  	}  } diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index eebcb0b97f0..8a7d54a5c97 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)  		kfree(d->rcvcount);  	if (!(d->rcvcount = kmalloc(sizeof(int) * m, GFP_ATOMIC))) {  		printk(KERN_WARNING "register_isdn: Could not alloc rcvcount\n"); -		if (!adding) kfree(d->rcverr); +		if (!adding) +			kfree(d->rcverr);  		return -1;  	}  	memset((char *) d->rcvcount, 0, sizeof(int) * m); | 
