OpenSDV
/
linux-stable-rt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] ieee1394: remove NULL checks for kfree 

This patch removes redundant NULL pointer checks before kfree() in all of
drivers/ieee1394/

Signed-off-by: Jesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: Jody McIntyre <scjody@steamballoon.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jody McIntyre 2005-05-16 21:54:01 -07:00 committed by Linus Torvalds
parent 9ac485dc37
commit 616b859fbd
3 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/ieee1394/nodemgr.c
View File

@ -1005,8 +1005,7 @@ static struct unit_directory *nodemgr_process_unit_directory
return ud;
unit_directory_error:
if (ud != NULL)
kfree(ud);
kfree(ud);
return NULL;
}

2
drivers/ieee1394/ohci1394.c
View File

@ -2931,7 +2931,7 @@ static void free_dma_rcv_ctx(struct dma_rcv_ctx *d)
kfree(d->prg_cpu);
kfree(d->prg_bus);
}
if (d->spb) kfree(d->spb);
kfree(d->spb);
/* Mark this context as freed. */
d->ohci = NULL;

29
drivers/ieee1394/video1394.c
View File

@ -180,23 +180,13 @@ static int free_dma_iso_ctx(struct dma_iso_ctx *d)
kfree(d->prg_reg);
}
if (d->ir_prg)
kfree(d->ir_prg);
if (d->it_prg)
kfree(d->it_prg);
if (d->buffer_status)
kfree(d->buffer_status);
if (d->buffer_time)
kfree(d->buffer_time);
if (d->last_used_cmd)
kfree(d->last_used_cmd);
if (d->next_buffer)
kfree(d->next_buffer);
kfree(d->ir_prg);
kfree(d->it_prg);
kfree(d->buffer_status);
kfree(d->buffer_time);
kfree(d->last_used_cmd);
kfree(d->next_buffer);
list_del(&d->link);
kfree(d);
return 0;
@ -1060,8 +1050,7 @@ static int __video1394_ioctl(struct file *file,
PRINT(KERN_ERR, ohci->host->id,
"Buffer %d is already used",v.buffer);
spin_unlock_irqrestore(&d->lock,flags);
if (psizes)
kfree(psizes);
kfree(psizes);
return -EBUSY;
}
@ -1116,9 +1105,7 @@ static int __video1394_ioctl(struct file *file,
}
}
if (psizes)
kfree(psizes);
kfree(psizes);
return 0;
}