On Sat, 7 May 2005, Jesper Juhl wrote:
> This patch removes redundant checks for NULL pointer before kfree() in
> drivers/telephony/
>
Joe Perches pointed out to me that
kfree
followed by
setting all structure members would be slightly better.
Incremental patch below.
Signed-off-by: Jesper Juhl <[email protected]>
---
drivers/telephony/ixj.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
--- linux-2.6.12-rc3-mm3/drivers/telephony/ixj.c.old 2005-05-07 03:50:43.000000000 +0200
+++ linux-2.6.12-rc3-mm3/drivers/telephony/ixj.c 2005-05-07 03:53:22.000000000 +0200
@@ -3865,9 +3865,9 @@ static int set_rec_codec(IXJ *j, int rat
j->rec_mode = 7;
break;
default:
+ kfree(j->read_buffer);
j->rec_frame_size = 0;
j->rec_mode = -1;
- kfree(j->read_buffer);
j->read_buffer = NULL;
j->read_buffer_size = 0;
retval = 1;
@@ -3987,7 +3987,7 @@ static int ixj_record_start(IXJ *j)
static void ixj_record_stop(IXJ *j)
{
- if(ixjdebug & 0x0002)
+ if (ixjdebug & 0x0002)
printk("IXJ %d Stopping Record Codec %d at %ld\n", j->board, j->rec_codec, jiffies);
kfree(j->read_buffer);
@@ -4443,9 +4443,9 @@ static int set_play_codec(IXJ *j, int ra
j->play_mode = 5;
break;
default:
+ kfree(j->write_buffer);
j->play_frame_size = 0;
j->play_mode = -1;
- kfree(j->write_buffer);
j->write_buffer = NULL;
j->write_buffer_size = 0;
retval = 1;
@@ -4570,7 +4570,7 @@ static int ixj_play_start(IXJ *j)
static void ixj_play_stop(IXJ *j)
{
- if(ixjdebug & 0x0002)
+ if (ixjdebug & 0x0002)
printk("IXJ %d Stopping Play Codec %d at %ld\n", j->board, j->play_codec, jiffies);
kfree(j->write_buffer);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[Index of Archives]
[Kernel Newbies]
[Netfilter]
[Bugtraq]
[Photo]
[Stuff]
[Gimp]
[Yosemite News]
[MIPS Linux]
[ARM Linux]
[Linux Security]
[Linux RAID]
[Video 4 Linux]
[Linux for the blind]
[Linux Resources]
